添加窗口大厅站点选项

base-manager/src/main/java/com/mortals/xhx/module/area/service/impl/AreaServiceImpl.java

@@ -170,23 +170,23 @@ public class AreaServiceImpl extends AbstractCRUDCacheServiceImpl<AreaDao, AreaE
      */
     @Override
     public List<AreaTreeSelect> buildCustomAreaTreeSelect(List<AreaEntity> areaList) {
-        List<AreaEntity> returnList = new ArrayList<>();
-
-        List<AreaEntity> list = this.find(new AreaQuery());
+        List<AreaTreeSelect> returnList = new ArrayList<>();
 
         List<Long> tempList = areaList.stream().map(AreaEntity::getId).collect(Collectors.toList());
-        for (AreaEntity areaEntity : list) {
+        for (AreaEntity areaEntity : areaList) {
             // 如果是顶级节点, 遍历该父节点的所有子节点
             if (!tempList.contains(areaEntity.getPid())) {
-                recursionFn(list, areaEntity);
-                returnList.add(areaEntity);
+                //recursionFn(list, areaEntity);
+                List<AreaTreeSelect> listTree = getListByRootId(areaEntity.getIid(), null);
+                AreaTreeSelect areaTreeSelect = new AreaTreeSelect(areaEntity);
+                areaTreeSelect.setChildren(listTree);
+                // areaEntity.setChildren();
+                returnList.add(areaTreeSelect);
             }
         }
-        if (returnList.isEmpty()) {
-            returnList = list;
-        }
 
-        return returnList.stream().map(AreaTreeSelect::new).collect(Collectors.toList());
+
+        return returnList;
     }
 
     @Override
@@ -306,7 +306,7 @@ public class AreaServiceImpl extends AbstractCRUDCacheServiceImpl<AreaDao, AreaE
     @Override
     public Rest<String> removeAll() {
         HashMap condition = new HashMap();
-        condition.put("1",1);
+        condition.put("1", 1);
         int delete = this.dao.delete(condition);
         //删除所有缓存数据
         this.removeAllCache();

base-manager/src/test/java/com/mortals/httpclient/system/system.http

@@ -6,7 +6,7 @@ Content-Type: application/json
 {
   "loginName":"banana",
   "password":"gxjG123!@#",
-  "securityCode":"8888"
+  "securityCode":"admin"
 }
 
 > {%
@@ -17,7 +17,13 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###构建站点树
 POST {{baseUrl}}/area/authAreaTree
-Authorization: eyJhbGciOiJIUzI1NiJ9.eyJsb2dpbl91c2VyX2tleSI6IjIwNjY6MThhNmEyOGM0ZDNhNGQ3OTgyYjlhOWFlYjU0MDU3MTAifQ.Ex92WgtbmsV6EBONj5SO48iG7oy4l6imsIcNK-qtJUw
+Authorization: {{authToken}}
+Accept: application/json
+
+
+###构建站点树
+POST {{baseUrl}}/area/treeselect
+Authorization: {{authToken}}
 Accept: application/json