|
@@ -491,20 +491,16 @@ public class SmartAuthorGroupController implements SmartAuthorGroupControllerAPI
|
|
|
return CommonResult.fail("有用户已删除");
|
|
return CommonResult.fail("有用户已删除");
|
|
|
}
|
|
}
|
|
|
if (!oldUserId.isEmpty()){
|
|
if (!oldUserId.isEmpty()){
|
|
|
|
|
+ List<Integer> userIds = new ArrayList<>();
|
|
|
for (int i = 0; i < oldUserId.size(); i++) {
|
|
for (int i = 0; i < oldUserId.size(); i++) {
|
|
|
System.out.println("-----"+oldUserId.get(i));
|
|
System.out.println("-----"+oldUserId.get(i));
|
|
|
if (!userList.contains(String.valueOf(oldUserId.get(i)))) {
|
|
if (!userList.contains(String.valueOf(oldUserId.get(i)))) {
|
|
|
- QueryWrapper<SmartAuthority> queryWrapper1 = new QueryWrapper<>();
|
|
|
|
|
- queryWrapper1.eq("deleted", 0);
|
|
|
|
|
- queryWrapper1.eq("user_id", oldUserId.get(i));
|
|
|
|
|
- List<SmartAuthority> smartAuthority1 = smartAuthorityService.getAuthorByKey(queryWrapper1);
|
|
|
|
|
- if (smartAuthority1.size() > 0) {
|
|
|
|
|
- SmartAuthority smartAuthority = smartAuthority1.get(0);
|
|
|
|
|
- smartAuthority.setDeleted(1);
|
|
|
|
|
- smartAuthorityService.updateSmartAuthority(smartAuthority);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ userIds.add(oldUserId.get(i));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ if(userIds != null && userIds.size() > 0){
|
|
|
|
|
+ smartAuthorityService.deleteAuthorityByUsergroup(userIds, id);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
for (int i = 0; i < newUserId.length; i++) {
|
|
for (int i = 0; i < newUserId.length; i++) {
|
|
|
if (!newUserId[i].equals("")){
|
|
if (!newUserId[i].equals("")){
|