|
@@ -115,6 +115,9 @@ public class SmartUserController implements SmartUserControllerAPI {
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private SmartTeachingService smartTeachingService;
|
|
private SmartTeachingService smartTeachingService;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private SmartAuthorGroupService smartAuthorGroupService;
|
|
|
|
|
+
|
|
|
private static Logger logger = LoggerFactory.getLogger(SmartUserController.class);
|
|
private static Logger logger = LoggerFactory.getLogger(SmartUserController.class);
|
|
|
|
|
|
|
|
//region 开发自己导数据用的接口
|
|
//region 开发自己导数据用的接口
|
|
@@ -4639,8 +4642,8 @@ public class SmartUserController implements SmartUserControllerAPI {
|
|
|
@Override
|
|
@Override
|
|
|
@DESRespondSecret(validated = true)
|
|
@DESRespondSecret(validated = true)
|
|
|
public CommonResult getPage(int currentPage, int pageCount, String keyWord) {
|
|
public CommonResult getPage(int currentPage, int pageCount, String keyWord) {
|
|
|
- LambdaQueryWrapper<SmartUser> wrapper=new LambdaQueryWrapper<>();
|
|
|
|
|
- wrapper.like(ObjectUtils.isNotEmpty(keyWord),SmartUser::getName,keyWord);
|
|
|
|
|
|
|
+ LambdaQueryWrapper<SmartUser> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
+ wrapper.like(ObjectUtils.isNotEmpty(keyWord), SmartUser::getName, keyWord);
|
|
|
IPage<SmartUser> page = smartUserService.page(new Page<>(currentPage, pageCount), wrapper);
|
|
IPage<SmartUser> page = smartUserService.page(new Page<>(currentPage, pageCount), wrapper);
|
|
|
|
|
|
|
|
return CommonResult.ok(page);
|
|
return CommonResult.ok(page);
|
|
@@ -5282,7 +5285,44 @@ public class SmartUserController implements SmartUserControllerAPI {
|
|
|
|
|
|
|
|
if (deleteUsers != null && deleteUsers.size() > 0) {
|
|
if (deleteUsers != null && deleteUsers.size() > 0) {
|
|
|
int deleteUser = smartUserService.deleteUserBatch(deleteUsers);
|
|
int deleteUser = smartUserService.deleteUserBatch(deleteUsers);
|
|
|
- return deleteUser > 0 ? CommonResult.ok("删除成功") : CommonResult.fail("删除失败");
|
|
|
|
|
|
|
+ if (deleteUser > 0) {
|
|
|
|
|
+ List<SmartAuthorGroup> allDatas = new ArrayList<>();//要被更新的权限组数据
|
|
|
|
|
+ List<Integer> deleteGroupId = new ArrayList<>();//要被删除的权限组
|
|
|
|
|
+ List<Integer> deleteUserId = new ArrayList<>();//要被删除的管理组权限
|
|
|
|
|
+ for (deleteUserVo dUser : deleteUsers) {
|
|
|
|
|
+ deleteUserId.add(dUser.getId());
|
|
|
|
|
+ List<SmartAuthorGroup> authGroups = smartAuthorGroupService.smartAuthorGroup(dUser.getId());
|
|
|
|
|
+ for (SmartAuthorGroup authGroup : authGroups) {
|
|
|
|
|
+ List<String> newUserId = new ArrayList<>();
|
|
|
|
|
+ List<String> userIds = Arrays.asList(authGroup.getUserId().split(","));
|
|
|
|
|
+ for (String userId:userIds) {
|
|
|
|
|
+ if(!userId.equals(String.valueOf(dUser.getId()))){
|
|
|
|
|
+ newUserId.add(userId);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ if(newUserId != null && newUserId.size() > 0){
|
|
|
|
|
+ authGroup.setUserId(StringUtils.join(newUserId,","));
|
|
|
|
|
+ allDatas.add(authGroup);
|
|
|
|
|
+ }else{
|
|
|
|
|
+ deleteGroupId.add(authGroup.getId());
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if(allDatas != null && allDatas.size() > 0){//更新权限组
|
|
|
|
|
+ smartAuthorGroupService.saveBatch(allDatas);
|
|
|
|
|
+ }
|
|
|
|
|
+ if(deleteGroupId != null && deleteGroupId.size() > 0){//删除权限组
|
|
|
|
|
+ smartAuthorGroupService.deleteSmartAuthorGroupByIds(deleteGroupId);
|
|
|
|
|
+ }
|
|
|
|
|
+ if(deleteUserId != null && deleteUserId.size() > 0){//删除管理组权限
|
|
|
|
|
+ smartAuthorityService.deleteAuthorityByUserIds(deleteUserId);
|
|
|
|
|
+ }
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return CommonResult.fail("删除失败");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return CommonResult.ok("删除成功");
|
|
return CommonResult.ok("删除成功");
|