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> getPidAreaByAreaId(@RequestParam(required = false)@ApiParam("id")String id , @RequestParam("type") Integer type) { + public HttpResult> getPidAreaByAreaId(@RequestParam(required = false)@ApiParam("id")String id , @RequestParam("type") Integer type) { String methodDescribe = getMethodDescribe("getAreaTree"); - List result = deptService.getPidAreaByAreaId(id,type); + List 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 { */ List getAreaTree(String id, Integer type); - List getPidAreaByAreaId(String id, Integer type); + List 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 implements ID @Override - public List getPidAreaByAreaId(String id, Integer type) { + public List getPidAreaByAreaId(String id, Integer type) { + List result = new ArrayList<>(); List deptBindAreaList = deptArea(); List 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