修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -12,8 +12,10 @@ import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import com.yeejoin.amos.boot.module.common.api.mapper.FireTeamMapper;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.ESOrgUsrService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -51,6 +53,10 @@ public class OrgUsrController extends BaseController {
     OrgUsrServiceImpl iOrgUsrService;
     @Autowired
     ESOrgUsrService eSOrgUsrService;
+
+    @Autowired
+    FireTeamMapper fireTeamMapper;
+
     @Autowired
     EmqKeeper emqKeeper;
     @Value("${jcs.company.topic.delete}")
@@ -85,19 +91,16 @@ public class OrgUsrController extends BaseController {
     public ResponseModel<String> deleteById(HttpServletRequest request, @PathVariable Long id) {
         // 删除时，只作逻辑删除
         // BUG 2741 首先判断是否为公司 如果公司底下有人员不可直接删除 bykongfm
-        OrgUsr tempOrg = iOrgUsrService.getById(id.toString());
-        if(tempOrg.getBizOrgType().equals("COMPANY")) {
-            List<OrgUsr> tempList = iOrgUsrService.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getParentId,id).eq(OrgUsr::getIsDelete,false));
-            if(tempList.size() > 0) {
-                return ResponseHelper.buildResponse("-1");
-            }
-        }
         //bug 2882 判断是否为部门 如果部门底下有人员不可直接删除 chenzhao 2021-09-27 start
-        if(tempOrg.getBizOrgType().equals("DEPARTMENT")) {
+        OrgUsr tempOrg = iOrgUsrService.getById(id.toString());
+        if(tempOrg.getBizOrgType().equals("COMPANY") || tempOrg.getBizOrgType().equals("DEPARTMENT")) {
             List<OrgUsr> tempList = iOrgUsrService.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getParentId,id).eq(OrgUsr::getIsDelete,false));
-            if(tempList.size() > 0) {
+            /*bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-09 start*/
+            List<FireTeam> fireTeams = fireTeamMapper.listFireTeamById(id);
+            if(tempList.size() > 0 || fireTeams.size() > 0 ) {
                 return ResponseHelper.buildResponse("-1");
             }
+            /*bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-09 end*/
         }
         //bug 2882 判断是否为部门 如果部门底下有人员不可直接删除 chenzhao 2021-09-27 end
 //        iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));