用户机构调整，用户删除警格绑定修改

zhongrj

2024-02-05 e13f2a82be5ebad924dfc92eb03f0448697624c4

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

@@ -148,8 +148,23 @@
    * @param user
    */
   public void updateGridBind(User user) {
      // 先删除原有区域的绑定
      QueryWrapper<PoliceAffairsGridEntity> queryWrapper = new QueryWrapper<>();
      queryWrapper.eq("is_deleted",0).like("police_user_id",user.getId());
      // 删除掉之前已绑定的
      List<PoliceAffairsGridEntity> list = SpringUtil.getBean(IPoliceAffairsGridService.class).list(queryWrapper);
      // 遍历
      for (PoliceAffairsGridEntity policeAffairsGridEntity : list) {
         List<String> arrayList = new ArrayList<>(Arrays.asList(policeAffairsGridEntity.getPoliceUserId().split(",")));
         arrayList.remove(user.getId().toString());
         // 更新
         policeAffairsGridEntity.setPoliceUserId(String.join(",",arrayList));
         // 解决更新报错
         policeAffairsGridEntity.setGeom(null);
         SpringUtil.getBean(IPoliceAffairsGridService.class).updateById(policeAffairsGridEntity);
      }
      // 判断机构类型
      List<String> deptIds = Arrays.asList(user.getDeptId().split(","));
      List<String> deptIds = new ArrayList<>(Arrays.asList(user.getDeptId().split(",")));
      for (String deptId : deptIds) {
         // 查询对应的机构
         Dept dept = SpringUtil.getBean(IDeptService.class).getById(deptId);
@@ -356,7 +371,39 @@
      if (Func.contains(Func.toLongArray(userIds), AuthUtil.getUserId())) {
         throw new ServiceException("不能删除本账号!");
      }
      return deleteLogic(Func.toLongList(userIds));
      boolean deleteLogic = deleteLogic(Func.toLongList(userIds));
      if (deleteLogic){
         // 删除警格绑定
         removePoliceGridBind(userIds);
      }
      return deleteLogic;
   }

   /**
    * 删除警格绑定
    * @param userIds
    */
   public void removePoliceGridBind(String userIds) {
      List<String> userIdList = new ArrayList<>(Arrays.asList(userIds.split(",")));
      for (String userId : userIdList) {
         // 先删除原有区域的绑定
         QueryWrapper<PoliceAffairsGridEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted",0).like("police_user_id",userId);
         // 删除掉之前已绑定的
         List<PoliceAffairsGridEntity> list = SpringUtil.getBean(IPoliceAffairsGridService.class).list(queryWrapper);
         if (list.size()>0) {
            // 遍历
            for (PoliceAffairsGridEntity policeAffairsGridEntity : list) {
               List<String> arrayList = new ArrayList<>(Arrays.asList(policeAffairsGridEntity.getPoliceUserId().split(",")));
               arrayList.remove(userId);
               // 更新
               policeAffairsGridEntity.setPoliceUserId(String.join(",", arrayList));
               // 解决更新报错
               policeAffairsGridEntity.setGeom(null);
               SpringUtil.getBean(IPoliceAffairsGridService.class).updateById(policeAffairsGridEntity);
            }
         }
      }
   }

   @Override