Merge remote-tracking branch 'origin/master'

linwei

2024-02-20 e67a8a7477096a295d65afa1c366d2b59f8752fc

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -212,9 +212,9 @@
   }

   @Override
   public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
   public IPage<User> selectUserPage(IPage<User> page, User user, String deptId, String tenantId) {
      if (null == deptId && !AuthUtil.isAdministrator()) {
         deptId = Long.parseLong(AuthUtil.getDeptId());
         deptId = AuthUtil.getDeptId();
      }
      List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
      return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
@@ -748,8 +748,14 @@
               list.remove(deptPcs.getId().toString());
               user.setDeptId(String.join(",",list));
            }
            if (!user.getDeptId().contains(dept.getId().toString())) {
               user.setDeptId(user.getDeptId() + "," + dept.getId());
            // 删完后可能就没了
            if (!Strings.isBlank(user.getDeptId())) {
               if (!user.getDeptId().contains(dept.getId().toString())) {
                  user.setDeptId(user.getDeptId() + "," + dept.getId());
               }
            }else {
               // 删完后的
               user.setDeptId(dept.getId().toString());
            }
         }else {
            if (!user.getDeptId().contains(dept.getId().toString())) {