From c97e98fd65cc8bd5a1f77aa053cf62a51517ed6f Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 18 Apr 2023 14:26:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E7=9B=91=E6=B5=8B=E7=82=B9=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E5=B1=95=E7=A4=BA=E7=9B=91=E6=B5=8B=E7=82=B9?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TerminalTreeServiceImpl.java | 44 +++++++++++++++---- .../system/service/impl/AreaServiceImpl.java | 3 ++ 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java index 872743f6c..8c285f8d0 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java @@ -239,8 +239,15 @@ public class TerminalTreeServiceImpl implements TerminalTreeService { String areaId = areaDetail.getId(); if (CollectionUtil.isNotEmpty(allList)) { - List projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); - List provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList()); + List projectList; + List provinceList; + if(!"0".equals(areaId)){ + projectList=allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); + provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList()); + }else{ + projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).collect(Collectors.toList()); + provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode())).collect(Collectors.toList()); + } for (TerminalTree terminalTree : provinceList) { terminalTree.setName(lineMapper.getProviceName(terminalTree.getName())); } @@ -314,8 +321,15 @@ public class TerminalTreeServiceImpl implements TerminalTreeService { String areaId = areaDetail.getId(); if (CollectionUtil.isNotEmpty(allList)) { - List projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); - List provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList()); + List projectList; + List provinceList; + if(!"0".equals(areaId)){ + projectList=allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); + provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList()); + }else{ + projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).collect(Collectors.toList()); + provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode())).collect(Collectors.toList()); + } for (TerminalTree terminalTree : provinceList) { terminalTree.setName(lineMapper.getProviceName(terminalTree.getName())); } @@ -380,8 +394,15 @@ public class TerminalTreeServiceImpl implements TerminalTreeService { String areaId = areaDetail.getId(); if (CollectionUtil.isNotEmpty(allList)) { - List projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); - List provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList()); + List projectList; + List provinceList; + if(!"0".equals(areaId)){ + projectList=allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); + provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList()); + }else{ + projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).collect(Collectors.toList()); + provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode())).collect(Collectors.toList()); + } for (TerminalTree terminalTree : provinceList) { terminalTree.setName(lineMapper.getProviceName(terminalTree.getName())); } @@ -454,8 +475,15 @@ public class TerminalTreeServiceImpl implements TerminalTreeService { String areaId = areaDetail.getId(); if (CollectionUtil.isNotEmpty(allList)) { - List projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); - List provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList()); + List projectList; + List provinceList; + if(!"0".equals(areaId)){ + projectList=allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList()); + provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList()); + }else{ + projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).collect(Collectors.toList()); + provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode())).collect(Collectors.toList()); + } for (TerminalTree terminalTree : provinceList) { terminalTree.setName(lineMapper.getProviceName(terminalTree.getName())); } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AreaServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AreaServiceImpl.java index 3016f9f83..76a6cf251 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AreaServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AreaServiceImpl.java @@ -208,6 +208,9 @@ public class AreaServiceImpl extends ServiceImpl implements IA areaQueryWrapper.eq("sys_area.type", type); areaQueryWrapper.eq("sys_area.state", DataStateEnum.ENABLE.getCode()); Area area = this.baseMapper.selectOne(areaQueryWrapper); + if (area.getPid().equals("-1")) { + return area; + } if (!area.getPid().equals("0")) { id = area.getPid(); area = areaPro(id, type);