BUG 2741 首先判断是否为公司 如果公司底下有人员不可直接删除

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.common.biz.controller;
 
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -76,8 +77,16 @@ public class OrgUsrController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
-    public ResponseModel<?> deleteById(HttpServletRequest request, @PathVariable Long id) {
+    public ResponseModel<String> deleteById(HttpServletRequest request, @PathVariable Long id) {
         // 删除时，只作逻辑删除
+        // BUG 2741 首先判断是否为公司 如果公司底下有人员不可直接删除 bykongfm
+        OrgUsr tempOrg = iOrgUsrService.getById(id);
+        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");
+            }
+        }
         iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));
         try {
             eSOrgUsrService.deleteById(id);
@@ -86,7 +95,7 @@ public class OrgUsrController extends BaseController {
             e.printStackTrace();
             throw new RuntimeException();
         }
-        return ResponseHelper.buildResponse(null);
+        return ResponseHelper.buildResponse("0");
     }