From 8e4fc1b70c8bcfb054cd6a661138e5b00ca59331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Tue, 31 Oct 2023 14:39:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/user/controller/DeptController.java    |  4 ++--
 .../com/njcn/user/service/IDeptService.java     |  2 +-
 .../njcn/user/service/impl/DeptServiceImpl.java | 17 ++++++++++++-----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java
index c50907796..1784aafc1 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java
@@ -93,9 +93,9 @@ public class DeptController extends BaseController {
             @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) {
+    public HttpResult<List<AreaTreeDTO>> getPidAreaByAreaId(@RequestParam(required = false)@ApiParam("id")String id , @RequestParam("type") Integer type) {
         String methodDescribe = getMethodDescribe("getAreaTree");
-        List<Area> result = deptService.getPidAreaByAreaId(id,type);
+        List<AreaTreeDTO> result = deptService.getPidAreaByAreaId(id,type);
         if (!result.isEmpty()) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
         } else {
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java
index 0afe869f0..8d1e7e9ac 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IDeptService.java
@@ -83,7 +83,7 @@ public interface IDeptService extends IService<Dept> {
      */
     List<AreaTreeDTO> getAreaTree(String id, Integer type);
 
-    List<Area> getPidAreaByAreaId(String id, Integer type);
+    List<AreaTreeDTO> getPidAreaByAreaId(String id, Integer type);
 
 
     /**
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java
index ee2696bbc..68922cacd 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java
@@ -215,15 +215,22 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 
 
     @Override
-    public List<Area> getPidAreaByAreaId(String id, Integer type) {
+    public List<AreaTreeDTO> getPidAreaByAreaId(String id, Integer type) {
+        List<AreaTreeDTO> result = new ArrayList<>();
         List<String> deptBindAreaList = deptArea();
         List<Area> areaList = areaFeignClient.getPidAreaList(id, type).getData();
-        areaList = areaList.stream().peek(item->{
+        areaList.forEach(item->{
+            AreaTreeDTO areaTreeDTO = new AreaTreeDTO();
             if(deptBindAreaList.contains(item.getId())){
-                item.setName(item.getName() + "(已被绑定)");
+                areaTreeDTO.setName(item.getName() + "(已被绑定)");
+                areaTreeDTO.setIsFalse(1);
+            }else {
+                areaTreeDTO.setName(item.getName());
+                areaTreeDTO.setIsFalse(0);
             }
-        }).collect(Collectors.toList());
-        return areaList;
+            result.add(areaTreeDTO);
+        });
+        return result;
     }
 
     @Override