feat(用户管理、角色管理、iam): 查询过滤admin账号
This commit is contained in:
+1
-1
@@ -150,7 +150,7 @@ public class SysUserController {
|
|||||||
queryWrapper.and(aw -> aw.like("realname", user.getRealnameOrUsername())
|
queryWrapper.and(aw -> aw.like("realname", user.getRealnameOrUsername())
|
||||||
.or().like("username", user.getRealnameOrUsername()));
|
.or().like("username", user.getRealnameOrUsername()));
|
||||||
}
|
}
|
||||||
|
queryWrapper.ne("username", "admin");
|
||||||
IPage<SysUser> pageList = sysUserService.queryPage(page, subDepIds, roleId, queryWrapper);
|
IPage<SysUser> pageList = sysUserService.queryPage(page, subDepIds, roleId, queryWrapper);
|
||||||
|
|
||||||
//批量查询用户的所属部门
|
//批量查询用户的所属部门
|
||||||
|
|||||||
@@ -86,6 +86,7 @@
|
|||||||
<if test="username!=null and username!=''">
|
<if test="username!=null and username!=''">
|
||||||
and username LIKE concat(concat('%',#{username}),'%')
|
and username LIKE concat(concat('%',#{username}),'%')
|
||||||
</if>
|
</if>
|
||||||
|
and username <> 'admin'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<!-- 修改用户部门code -->
|
<!-- 修改用户部门code -->
|
||||||
|
|||||||
+2
-1
@@ -922,6 +922,7 @@ public class SyncIamService {
|
|||||||
public IamUserIdListResponse getAllUserIds(IamCommonAcceptDto commonAcceptDto){
|
public IamUserIdListResponse getAllUserIds(IamCommonAcceptDto commonAcceptDto){
|
||||||
QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<SysUser>();
|
QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<SysUser>();
|
||||||
userQueryWrapper.select("id");
|
userQueryWrapper.select("id");
|
||||||
|
userQueryWrapper.ne("username", "admin");
|
||||||
// 获取全部用户的id,得到一个String的list
|
// 获取全部用户的id,得到一个String的list
|
||||||
List<String> userIds = this.sysUserService.list(userQueryWrapper).stream().map(SysUser::getId).collect(Collectors.toList());
|
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());
|
LoginUser userInfo = sysBaseAPI.getUserById(iamUserAcceptDto.getBimUid());
|
||||||
SysUser sysUser = sysUserService.getById(iamUserAcceptDto.getBimUid());
|
SysUser sysUser = sysUserService.getById(iamUserAcceptDto.getBimUid());
|
||||||
|
|
||||||
if (userInfo == null){
|
if (userInfo == null || "admin".equals(userInfo.getUsername())){
|
||||||
throw new IamGlobalException(iamUserAcceptDto.getBimRequestId(), "查询用户不存在");
|
throw new IamGlobalException(iamUserAcceptDto.getBimRequestId(), "查询用户不存在");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user