Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

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

@@ -54,7 +54,7 @@ POST {{baseUrl}}/base/area/genSubAreaByAreaName
 Content-Type: application/json
 
 {
-  "areaCode": "513232000000"
+  "areaCode": "511722000000"
 }
 
 

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

@@ -115,7 +115,7 @@ POST {{baseUrl}}/site/syncGovMatterBySiteId
 Content-Type: application/json
 
 {
-  "id":21
+  "id":1
 }
 
 

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

 
 ###窗口业务列表
-POST {{baseUrl}}/window/business/list
+POST {{baseUrl}}/window/business/interlist
 Content-Type: application/json
 
 {"windowIdList":["77","78","79","80","81","82","83","84","85","86","87","88","89","90","91","92","93","94","95","96","97","98","99"],"size":-1}

portal-manager/src/main/java/com/mortals/xhx/module/user/service/impl/UserServiceImpl.java

@@ -26,6 +26,8 @@ import com.mortals.xhx.feign.skin.ISkinSampleFeign;
 import com.mortals.xhx.module.area.model.AreaQuery;
 import com.mortals.xhx.module.area.service.AreaService;
 import com.mortals.xhx.module.menu.service.MenuService;
+import com.mortals.xhx.module.role.model.RoleQuery;
+import com.mortals.xhx.module.role.model.RoleUserEntity;
 import com.mortals.xhx.module.role.model.RoleUserQuery;
 import com.mortals.xhx.module.role.service.RoleService;
 import com.mortals.xhx.module.role.service.RoleUserService;
@@ -87,7 +89,7 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
     }
 
 
-    /*    @Override
+      @Override
     protected void findAfter(UserEntity entity, PageInfo pageInfo, Context context, List<UserEntity> list) throws AppException {
         Map<Long, String> roleMap = roleService.find(new RoleQuery()).stream().collect(Collectors.toMap(x -> x.getId(), y -> y.getName()));
         List<Long> userIdList = list.stream().map(item -> item.getId()).collect(Collectors.toList());
@@ -101,7 +103,7 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
             }
         });
         super.findAfter(entity, pageInfo, context, list);
-    }*/
+    }
 
     private void doHandlerUser(UserEntity entity) throws AppException {
         if (StringUtils.isNotEmpty(entity.getLoginPwd())) {