From c2532afffe685e77cf60b66644b921094adc09a4 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 18 四月 2025 15:56:41 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/system/controller/RoleController.java | 4 ++--
src/main/java/com/zy/system/controller/UserController.java | 10 +++++-----
src/main/resources/mapper/RoleMapper.xml | 4 ++--
src/main/resources/mapper/UserMapper.xml | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/RoleController.java b/src/main/java/com/zy/system/controller/RoleController.java
index 2657b40..e14c5e1 100644
--- a/src/main/java/com/zy/system/controller/RoleController.java
+++ b/src/main/java/com/zy/system/controller/RoleController.java
@@ -59,9 +59,9 @@
}
}
- List<Role> roleList = roleService.selectRoleList(leaderIdList,curr,limit);
+ List<Role> roleList = roleService.selectRoleList(leaderIdList.isEmpty() ? null:leaderIdList,curr,limit);
Page<Role> page = new Page<Role>(curr,limit).setRecords(roleList);
- page.setTotal(roleService.selectRoleListTotal(leaderIdList));
+ page.setTotal(roleService.selectRoleListTotal(leaderIdList.isEmpty() ? null:leaderIdList));
return R.ok(page);
}
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index d8ec24f..c24da8d 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -52,19 +52,19 @@
Long roleId = getUser().getRoleId();
Role role = roleService.selectById(roleId);
Long leaderId = role.getLeader();
- List<Long> leaderIds = new ArrayList<>();
+ List<Long> leaderIdList = new ArrayList<>();
if (null != leaderId) {
- leaderIds.add(role.getId());
+ leaderIdList.add(role.getId());
while (leaderId != null) {
Role leader = roleService.selectById(leaderId);
- leaderIds.add(leader.getId());
+ leaderIdList.add(leader.getId());
leaderId = leader.getLeader();
}
}
- List<User> userList = userService.selectUserList(leaderIds,curr,limit);
+ List<User> userList = userService.selectUserList(leaderIdList.isEmpty() ? null:leaderIdList,curr,limit);
Page<User> page = new Page<User>(curr,limit).setRecords(userList);
- page.setTotal(userService.selectUserListTotal(leaderIds));
+ page.setTotal(userService.selectUserListTotal(leaderIdList.isEmpty() ? null:leaderIdList));
return R.ok(page);
}
diff --git a/src/main/resources/mapper/RoleMapper.xml b/src/main/resources/mapper/RoleMapper.xml
index 5877bcc..1403569 100644
--- a/src/main/resources/mapper/RoleMapper.xml
+++ b/src/main/resources/mapper/RoleMapper.xml
@@ -15,7 +15,7 @@
<select id="selectRoleList" resultMap="BaseResultMap">
SELECT * FROM "SOURCE"."sys_role"
WHERE 1=1
- <if test="leaderIdList != null and leaderIdList != ''">
+ <if test="leaderIdList != null">
and ID not in
<foreach collection="leaderIdList" item="item" index="index" separator="," open="(" close=")">
#{item}
@@ -28,7 +28,7 @@
<select id="selectRoleListTotal" resultType="Long">
SELECT count(1) FROM "SOURCE"."sys_role"
WHERE 1=1
- <if test="leaderIdList != null and leaderIdList != ''">
+ <if test="leaderIdList != null">
and ID not in
<foreach collection="leaderIdList" item="item" index="index" separator="," open="(" close=")">
#{item}
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 26b82da..b7f7f48 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -18,7 +18,7 @@
<select id="selectUserList" resultMap="BaseResultMap">
SELECT * FROM "SOURCE"."sys_user"
WHERE 1=1
- <if test="leaderIdList != null and leaderIdList != ''">
+ <if test="leaderIdList != null">
and ID not in
<foreach collection="leaderIdList" item="item" index="index" separator="," open="(" close=")">
#{item}
@@ -31,7 +31,7 @@
<select id="selectUserListTotal" resultType="Long">
SELECT count(1) FROM "SOURCE"."sys_user"
WHERE 1=1
- <if test="leaderIdList != null and leaderIdList != ''">
+ <if test="leaderIdList != null">
and ID not in
<foreach collection="leaderIdList" item="item" index="index" separator="," open="(" close=")">
#{item}
--
Gitblit v1.9.1