添加用户扩展xml

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -207,24 +207,25 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         List<SiteEntity> siteEntities = this.getCacheList();
 
         for (SiteEntity siteEntity : siteEntities) {
-            boolean bool = getSite(areaCode, siteList, siteEntity);
+            boolean bool = getSite(areaCode,siteEntity.getAreaCode(), siteList, siteEntity);
             if (bool) continue;
 
         }
         return siteList;
     }
 
-    private boolean getSite(String areaCode, List<SiteEntity> siteList, SiteEntity siteEntity) {
-        AreaEntity areaTemp = areaService.getExtCache(siteEntity.getAreaCode());
-        if (areaCode.equals(areaTemp.getAreaCode())) {
+    private boolean getSite(String rootAreaCode,String areaCode, List<SiteEntity> siteList, SiteEntity siteEntity) {
+       // AreaEntity areaTemp = areaService.getExtCache(siteEntity.getAreaCode());
+        if (rootAreaCode.equals(areaCode)) {
             siteList.add(siteEntity);
             log.info("add site:{}", siteEntity.getSiteCode());
             return true;
         } else {
+            AreaEntity areaTemp = areaService.getExtCache(areaCode);
             if (!ObjectUtils.isEmpty(areaTemp.getPid())) {
                 AreaEntity areaEntity = areaService.selectOne(new AreaQuery().iid(areaTemp.getPid()));
                 if (!ObjectUtils.isEmpty(areaEntity)) {
-                    return getSite(areaEntity.getAreaCode(), siteList, siteEntity);
+                    return getSite(rootAreaCode,areaEntity.getAreaCode(), siteList, siteEntity);
                 }
             }
             return false;