更新事项，异步更新关联

base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -497,7 +497,7 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
 
 
         System.out.println(SecurityUtil.md5DoubleEncoding("xhxADMIN8@a"));
-        System.out.println(SecurityUtil.md5DoubleEncoding("123"));
+      //  System.out.println(SecurityUtil.md5DoubleEncoding("123"));
        // System.out.println(SecurityUtil.md5DoubleEncoding("Qt123456@"));
 
 /*

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

@@ -592,6 +592,17 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         //获取所有层级的区域
         List<AreaEntity> areaEntities = areaService.find(new AreaQuery().areaLevel(query.getAreaLevel()));
 
+        //如果针对某个区域查询 过滤到其它区域
+        if (!ObjectUtils.isEmpty(query.getSiteName())) {
+            SiteEntity siteEntity = this.selectOne(new SiteQuery().siteName(query.getSiteName()));
+            if (!ObjectUtils.isEmpty(siteEntity)) {
+                AreaEntity areaCache = areaService.getExtCache(siteEntity.getAreaCode());
+                if(!ObjectUtils.isEmpty(areaCache)){
+                    areaEntities = areaEntities.stream().filter(f -> f.getName().equals(areaCache.getName())).collect(Collectors.toList());
+                }
+            }
+        }
+
         List<SiteEntity> list = new ArrayList<>();
         for (AreaEntity areaEntity : areaEntities) {
             List<SiteEntity> siteEntityList = this.find(new SiteQuery().areaCode(areaEntity.getAreaCode()));

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

@@ -20,6 +20,17 @@ Content-Type: application/json
 }
 
 
+###站点列表
+POST http://10.233.82.175:11078/base/site/interlist
+Content-Type: application/json
+
+{
+  "page":1,
+  "size":10
+}
+
+
+
 ###站点更新与保存
 POST {{baseUrl}}/site/save
 Content-Type: application/json
@@ -147,4 +158,4 @@ Content-Type: application/json
 POST {{baseUrl}}/site/getSitesGroupByAreaLevel
 Content-Type: application/json
 
-{"areaLevel":2}
+{"areaLevel":3,"siteName": "翠屏区政务服务中心"}

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

+GET http://localhost:80/api/item?id=99
+Accept: application/json
+
+###
 
 ###
 POST {{baseUrl}}/file/commonupload
@@ -28,6 +32,9 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 
 
+
+
+
 ###首页
 POST {{baseUrl}}/login/index
 Authorization: {{authToken}}
@@ -53,6 +60,13 @@ GET {{baseUrl}}/cipher/check
 Accept: application/json
 
 
+### 测试
+GET http://192.168.0.98:11072/zwfw_api/admin/statistic/ages?selected=1& substr(user,1,1) = 'a'
+siteid:1
+Authtoken: eyJhbGciOiJIUzI1NiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE6MTNiMzE5MDcyMGIzNDQ0ODhiMGJhMmYzN2Y0MTY0MmEifQ.QVWLf0559EbLOUs7RXYu_SStviBkJt0wwiH8461lpd4
+
+
+
 ### license upload
 POST {{baseUrl}}/cipher/upload
 Content-Type: multipart/form-data; boundary=WebAppBoundary