From 2cb0c4ed3bc190e004eb11d7758a17b155142780 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 16 十一月 2023 17:07:14 +0800
Subject: [PATCH] Changes
---
zt/core/src/main/resources/mapper/sys/SysUserDao.xml | 2 +-
zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java | 3 ++-
core/src/main/java/com/zt/life/sys/controller/UserExtController.java | 4 +++-
zt/core/src/main/java/com/zt/modules/sys/dao/SysUserDao.java | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/core/src/main/java/com/zt/life/sys/controller/UserExtController.java b/core/src/main/java/com/zt/life/sys/controller/UserExtController.java
index 26d8080..9ac7d2d 100644
--- a/core/src/main/java/com/zt/life/sys/controller/UserExtController.java
+++ b/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());
}
diff --git a/zt/core/src/main/java/com/zt/modules/sys/dao/SysUserDao.java b/zt/core/src/main/java/com/zt/modules/sys/dao/SysUserDao.java
index c054a8d..8fc0dd2 100644
--- a/zt/core/src/main/java/com/zt/modules/sys/dao/SysUserDao.java
+++ b/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();
}
diff --git a/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java b/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java
index 4026bcc..e3de51f 100644
--- a/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java
+++ b/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();
}
}
diff --git a/zt/core/src/main/resources/mapper/sys/SysUserDao.xml b/zt/core/src/main/resources/mapper/sys/SysUserDao.xml
index 16ca6ed..a21b4c7 100644
--- a/zt/core/src/main/resources/mapper/sys/SysUserDao.xml
+++ b/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>
--
Gitblit v1.9.1