添加用户扩展xml

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

@@ -14,6 +14,7 @@ import com.mortals.xhx.module.area.service.AreaService;
 import com.mortals.xhx.module.site.model.SiteQuery;
 import com.mortals.xhx.module.site.model.SiteTreeSelect;
 import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
@@ -33,6 +34,7 @@ import java.util.stream.Collectors;
  * @date 2022-01-12
  */
 @Service("siteService")
+@Slf4j
 public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteEntity, Long> implements SiteService {
 
     // private List<SiteTreeSelect> siteTreeList;
@@ -202,26 +204,31 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
             throw new AppException(String.format("区域不存在！区域编码：%s", areaCode));
         }
 
-        this.getCacheList().stream().forEach(siteEntity -> {
-            //递归查找 如果满足条件 添加到站点列表
-            getSite(areaCode, siteList, siteEntity);
-        });
+        List<SiteEntity> siteEntities = this.getCacheList();
+
+        for (SiteEntity siteEntity : siteEntities) {
+            boolean bool = getSite(areaCode, siteList, siteEntity);
+            if (bool) continue;
+
+        }
         return siteList;
     }
 
-    private void getSite(String areaCode, List<SiteEntity> siteList, SiteEntity siteEntity) {
+    private boolean getSite(String areaCode, List<SiteEntity> siteList, SiteEntity siteEntity) {
         AreaEntity areaTemp = areaService.getExtCache(siteEntity.getAreaCode());
         if (areaCode.equals(areaTemp.getAreaCode())) {
             siteList.add(siteEntity);
-            return;
+            log.info("add site:{}", siteEntity.getSiteCode());
+            return true;
         } else {
             if (!ObjectUtils.isEmpty(areaTemp.getPid())) {
                 AreaEntity areaEntity = areaService.selectOne(new AreaQuery().iid(areaTemp.getPid()));
                 if (!ObjectUtils.isEmpty(areaEntity)) {
-                    getSite(areaEntity.getAreaCode(), siteList, siteEntity);
+                    return getSite(areaEntity.getAreaCode(), siteList, siteEntity);
 
                 }
             }
+            return false;
         }
     }