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<TerminalTree> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList());
-            List<TerminalTree> provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList());
+            List<TerminalTree> projectList;
+            List<TerminalTree> 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<TerminalTree> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList());
-            List<TerminalTree> provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList());
+            List<TerminalTree> projectList;
+            List<TerminalTree> 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<TerminalTree> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList());
-            List<TerminalTree> provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList());
+            List<TerminalTree> projectList;
+            List<TerminalTree> 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<TerminalTree> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()) && lineMapper.selectProject(areaId).contains(item.getId())).collect(Collectors.toList());
-            List<TerminalTree> provinceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROVINCE_LEVEL.getCode()) && item.getName().equals(areaId)).collect(Collectors.toList());
+            List<TerminalTree> projectList;
+            List<TerminalTree> 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<AreaMapper, Area> 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);