Merge remote-tracking branch 'origin/master'

linwei

2024-02-06 180905ee0e0fd86ff59d7aae19fd49d8618bd95b

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

@@ -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())) {