部门单位修改接口新增

pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java

@@ -11,6 +11,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
 import com.njcn.system.pojo.dto.AreaTreeDTO;
+import com.njcn.system.pojo.po.Area;
 import com.njcn.user.pojo.dto.DeptDTO;
 import com.njcn.user.pojo.param.DeptParam;
 import com.njcn.user.pojo.po.Dept;
@@ -80,6 +81,29 @@ public class DeptController extends BaseController {
         }
     }
 
+    /**
+     * 根据部门区域id获取父级部门下级所有区域
+     * @author cdf
+     * @date 2023/10/25
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @PostMapping("/getPidAreaByAreaId")
+    @ApiOperation("查询区域树")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id",value = "区域id"),
+            @ApiImplicitParam(name = "type", value = "区域类型", required = true)
+    })
+    public HttpResult<List<Area>> getPidAreaByAreaId(@RequestParam(required = false)@ApiParam("id")String id , @RequestParam("type") Integer type) {
+        String methodDescribe = getMethodDescribe("getAreaTree");
+        List<Area> result = deptService.getPidAreaByAreaId(id,type);
+        if (!result.isEmpty()) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+    }
+
+
     /**
      * 新增部门
      *
@@ -166,7 +190,6 @@ public class DeptController extends BaseController {
         if (!result.isEmpty()) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
         } else {
-
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
         }
     }

pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java

@@ -3,6 +3,7 @@ package com.njcn.user.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.system.pojo.dto.AreaTreeDTO;
+import com.njcn.system.pojo.po.Area;
 import com.njcn.user.pojo.dto.DeptDTO;
 import com.njcn.user.pojo.param.DeptParam;
 import com.njcn.user.pojo.po.Dept;
@@ -82,6 +83,9 @@ public interface IDeptService extends IService<Dept> {
      */
     List<AreaTreeDTO> getAreaTree(String id, Integer type);
 
+    List<Area> getPidAreaByAreaId(String id, Integer type);
+
+
     /**
      * 获取省份ids
      * @param ids ids

pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java

@@ -16,6 +16,7 @@ import com.njcn.device.biz.commApi.CommLedgerDeptClient;
 import com.njcn.device.pq.api.DeptLineFeignClient;
 import com.njcn.system.api.AreaFeignClient;
 import com.njcn.system.pojo.dto.AreaTreeDTO;
+import com.njcn.system.pojo.po.Area;
 import com.njcn.user.enums.UserResponseEnum;
 import com.njcn.user.enums.UserStatusEnum;
 import com.njcn.user.mapper.DeptMapper;
@@ -212,6 +213,19 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
         return list;
     }
 
+
+    @Override
+    public List<Area> getPidAreaByAreaId(String id, Integer type) {
+        List<String> deptBindAreaList = deptArea();
+        List<Area> areaList = areaFeignClient.getPidAreaList(id, type).getData();
+        areaList = areaList.stream().peek(item->{
+            if(deptBindAreaList.contains(item.getId())){
+                item.setName(item.getName() + "(已被绑定)");
+            }
+        }).collect(Collectors.toList());
+        return areaList;
+    }
+
     @Override
     public boolean selectPid(List<String> ids) {
         /**