From 93ac4c9a063bddb21b77c15eba29c4b6b31722cc Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Thu, 21 Dec 2023 17:23:07 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=81=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E3=80=81iam):=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=87=E6=BB=A4admin=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/system/controller/SysUserController.java  | 2 +-
 .../java/com/jero/modules/system/mapper/xml/SysUserMapper.xml  | 1 +
 .../com/jero/modules/docking/iam/service/SyncIamService.java   | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
index c1700230..16afc6df 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
@@ -150,7 +150,7 @@ public class SysUserController {
             queryWrapper.and(aw -> aw.like("realname", user.getRealnameOrUsername())
                     .or().like("username", user.getRealnameOrUsername()));
         }
-
+        queryWrapper.ne("username", "admin");
         IPage<SysUser> pageList = sysUserService.queryPage(page, subDepIds, roleId, queryWrapper);
 
 		//批量查询用户的所属部门
diff --git a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
index 6ba5f6af..0d3056c6 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
+++ b/laws-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
@@ -86,6 +86,7 @@
 		<if test="username!=null and username!=''">
 			and username LIKE concat(concat('%',#{username}),'%')
 		</if>
+			and username &lt;&gt; 'admin'
 	</select>
 
 	<!--  修改用户部门code -->
diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java
index 0c0700e0..7c30224b 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java
@@ -922,6 +922,7 @@ public class SyncIamService {
     public IamUserIdListResponse getAllUserIds(IamCommonAcceptDto commonAcceptDto){
         QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<SysUser>();
         userQueryWrapper.select("id");
+        userQueryWrapper.ne("username", "admin");
         // 获取全部用户的id，得到一个String的list
         List<String> userIds = this.sysUserService.list(userQueryWrapper).stream().map(SysUser::getId).collect(Collectors.toList());
 
@@ -961,7 +962,7 @@ public class SyncIamService {
         LoginUser userInfo = sysBaseAPI.getUserById(iamUserAcceptDto.getBimUid());
         SysUser sysUser = sysUserService.getById(iamUserAcceptDto.getBimUid());
 
-        if (userInfo == null){
+        if (userInfo == null || "admin".equals(userInfo.getUsername())){
             throw new IamGlobalException(iamUserAcceptDto.getBimRequestId(), "查询用户不存在");
         }