添加窗口大厅站点选项

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

@@ -45,6 +45,9 @@ public interface AreaService extends ICRUDCacheService<AreaEntity,Long> {
     List<AreaTreeSelect> buildAreaTreeSelect(List<AreaEntity> areaList);
 
 
+    List<AreaTreeSelect> buildCustomAreaTreeSelect(List<AreaEntity> areaList);
+
+
     /**
      * 根据父id查询子节点
      * @param parentId

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

@@ -164,6 +164,31 @@ public class AreaServiceImpl extends AbstractCRUDCacheServiceImpl<AreaDao, AreaE
         return returnList.stream().map(AreaTreeSelect::new).collect(Collectors.toList());
     }
 
+    /**
+     * @param areaList
+     * @return
+     */
+    @Override
+    public List<AreaTreeSelect> buildCustomAreaTreeSelect(List<AreaEntity> areaList) {
+        List<AreaEntity> returnList = new ArrayList<>();
+
+        List<AreaEntity> list = this.find(new AreaQuery());
+
+        List<Long> tempList = areaList.stream().map(AreaEntity::getId).collect(Collectors.toList());
+        for (AreaEntity areaEntity : areaList) {
+            // 如果是顶级节点, 遍历该父节点的所有子节点
+            if (!tempList.contains(areaEntity.getPid())) {
+                recursionFn(list, areaEntity);
+                returnList.add(areaEntity);
+            }
+        }
+        if (returnList.isEmpty()) {
+            returnList = list;
+        }
+
+        return returnList.stream().map(AreaTreeSelect::new).collect(Collectors.toList());
+    }
+
     @Override
     public List<AreaTreeSelect> getListByParentId(String parentId, Context context) {
         if (ObjectUtils.isEmpty(parentId)) {

base-manager/src/main/java/com/mortals/xhx/module/area/web/AreaController.java

@@ -88,7 +88,7 @@ public class AreaController extends BaseCRUDJsonBodyMappingController<AreaServic
             AreaQuery areaQuery = new AreaQuery();
             areaQuery.setAreaCodeList(areaCodeList);
             List<AreaEntity> list = this.service.find(areaQuery);
-            List<AreaTreeSelect> treeSelects = this.service.buildAreaTreeSelect(list);
+            List<AreaTreeSelect> treeSelects = this.service.buildCustomAreaTreeSelect(list);
             model.put(KEY_RESULT_DATA, treeSelects);
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {

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

@@ -15,6 +15,11 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 %}
 
 
+###构建站点树
+POST {{baseUrl}}/area/authAreaTree
+Authorization: eyJhbGciOiJIUzI1NiJ9.eyJsb2dpbl91c2VyX2tleSI6IjIwNjY6NDAxNzM1MjgxOTJhNGZkYjk1MzM4MGUxMmI3NmM1YTYifQ.UsT-5N5SdhCRPTWI64bi9xVYjIIq60RPzRfb3eIUgp4
+Accept: application/json
+
 
 ###首页
 POST {{baseUrl}}/login/index