Changes

jinlin

2023-11-16 2cb0c4ed3bc190e004eb11d7758a17b155142780

Changes

 core/src/main/java/com/zt/life/sys/controller/UserExtController.java

@@ -1,5 +1,7 @@
package com.zt.life.sys.controller;

import com.zt.life.sys.model.SysUserReg;
import com.zt.life.sys.model.SysUserRegister;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -88,7 +90,7 @@
    @GetMapping("getUsersList")
    @ApiOperation("返回用户列表")
    @LogOperation("返回用户列表")
    public Result<Map<String, Object>> getUsersList() {
    public Result<List<SysUser>> getUsersList() {
         return Result.ok(sysUserService.getUsersList());
    }


 zt/core/src/main/java/com/zt/modules/sys/dao/SysUserDao.java

@@ -54,5 +54,5 @@
    void updatePassword(SysUser entity);

    Integer checkTestHome(String systemId, Long userId);
    Map<String, Object> getUsersList();
    List<SysUser> getUsersList();
}

 zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java

@@ -62,6 +62,7 @@
    @Autowired
    SysMapService sysMapService;


    public List<SysUser> page(QueryFilter queryFilter) {
        // 普通管理员，只能查询所属部门及子部门的数据
        User user = UserContext.getUser();
@@ -322,7 +323,7 @@
        return num;
    }

    public Map<String, Object> getUsersList() {
    public List<SysUser> getUsersList() {
        return baseDao.getUsersList();
    }
}

 zt/core/src/main/resources/mapper/sys/SysUserDao.xml

@@ -242,7 +242,7 @@
            )
            )
    </select>
    <select id="getUsersList" resultType="java.lang.Object">
    <select id="getUsersList" resultType="com.zt.core.sys.model.SysUser">
        select nick_name,user_id from sys_user
    </select>