From 961e4a807133d53f371f98195c9d8348a0227967 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 16 十一月 2023 16:54:59 +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 | 2 +-
core/src/main/java/com/zt/life/sys/controller/UserExtController.java | 3 ++-
zt/core/src/main/java/com/zt/modules/sys/dao/SysUserDao.java | 2 +-
4 files changed, 5 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 e65ffa0..26d8080 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
@@ -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());
}
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 a48d573..c054a8d 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);
- SysUser getUsersList();
+ Map<String, Object> 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 bda0d1f..4026bcc 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
@@ -322,7 +322,7 @@
return num;
}
- public SysUser getUsersList() {
+ public Map<String, Object> 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 a21b4c7..16ca6ed 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="com.zt.core.sys.model.SysUser">
+ <select id="getUsersList" resultType="java.lang.Object">
select nick_name,user_id from sys_user
</select>
--
Gitblit v1.9.1