Changes

jinlin

2023-11-16 961e4a807133d53f371f98195c9d8348a0227967

Changes

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

@@ -26,6 +26,7 @@
import io.swagger.annotations.ApiOperation;

import java.util.List;
import java.util.Map;

/**
 * 用户管理
@@ -87,7 +88,7 @@
    @GetMapping("getUsersList")
    @ApiOperation("返回用户列表")
    @LogOperation("返回用户列表")
    public Result<SysUser> getUsersList() {
    public Result<Map<String, Object>> 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);
    SysUser getUsersList();
    Map<String, Object> getUsersList();
}

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

@@ -322,7 +322,7 @@
        return num;
    }

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

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

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