用户列表查询以及站点授权bug修改

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

 package com.mortals.xhx.module.user.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.ap.SysConstains;
 import com.mortals.framework.common.code.UserType;
 import com.mortals.framework.exception.AppException;
@@ -9,6 +11,8 @@ import com.mortals.framework.model.Result;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.util.SecurityUtil;
 import com.mortals.framework.util.StringUtils;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.feign.rsp.ApiResp;
 import com.mortals.xhx.module.area.model.AreaQuery;
 import com.mortals.xhx.module.area.service.AreaService;
 import com.mortals.xhx.module.menu.service.MenuService;
@@ -80,7 +84,12 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
         }
         if(StringUtils.isNotEmpty(entity.getAreaCodes())){
             List<String> areaCodeList = Arrays.asList(entity.getAreaCodes().split(","));
-            String siteIds = areaService.getFlatSitesByAreaCodes(new AreaQuery().areaCodeList(areaCodeList), null);
+            String resp = areaService.getFlatSitesByAreaCodes(new AreaQuery().areaCodeList(areaCodeList), null);
+            JSONObject apiResp = JSON.parseObject(resp);
+            if (apiResp.getInteger("code") != YesNoEnum.YES.getValue()) {
+                throw new AppException("获取用户站点列表树数据失败：" + apiResp.getString("msg"));
+            }
+            String siteIds = apiResp.getString("data");
             entity.setSiteIds(siteIds);
         }
 
@@ -206,10 +215,15 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
 
     @Override
     public void siteAuth(UserEntityExt entityExt, Context context) {
-        if (!ObjectUtils.isEmpty(entityExt.getUserId())) {
+        if (ObjectUtils.isEmpty(entityExt.getUserId())) {
             throw new AppException("用户ID不能为空！");
         }
-        String siteIds = areaService.getFlatSitesByAreaCodes(new AreaQuery().areaCodeList(entityExt.getAreaCodeList()), context);
+        String resp = areaService.getFlatSitesByAreaCodes(new AreaQuery().areaCodeList(entityExt.getAreaCodeList()), context);
+        JSONObject apiResp = JSON.parseObject(resp);
+        if (apiResp.getInteger("code") != YesNoEnum.YES.getValue()) {
+            throw new AppException("获取用户站点列表树数据失败：" + apiResp.getString("msg"));
+        }
+        String siteIds = apiResp.getString("data");
         UserEntity userEntity = this.get(entityExt.getUserId(), context);
         userEntity.setAreaCodes(entityExt.getAreaCodeList().stream().collect(Collectors.joining(",")));
         userEntity.setSiteIds(siteIds);

portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserController.java

@@ -100,7 +100,7 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
 
     @Override
     @UnAuth
-    public Rest<Object> list(UserEntity query) {
+    public Rest<Object> list(@RequestBody UserEntity query) {
         Map<String, Object> model = new HashMap();
         Rest<Object> ret = new Rest<>();
         Context context = this.getContext();