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

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java

@@ -262,23 +262,14 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
         String busiDesc = "查询" + this.getModuleDesc();
         int code = 1;
         try {
-            if(this.getCurUser().getId()==1){
-                List<SiteEntity> siteEntityList = new ArrayList<>();
-                SiteEntity siteEntity = new SiteEntity();
-                siteEntity.setId(0l);
-                siteEntity.setSiteName("无站点");
-                siteEntityList.add(siteEntity);
+            if (CollectionUtils.isNotEmpty(query.getAreaCodeList())) {
+                List<SiteEntity> siteEntityList = query.getAreaCodeList().parallelStream().flatMap(areaId ->
+                        this.service.getFlatSitesByAreaCode(areaId, getContext()).stream()
+                ).distinct().collect(Collectors.toList());
                 model.put("data", siteEntityList);
-            }else {
-                if (CollectionUtils.isNotEmpty(query.getAreaCodeList())) {
-                    List<SiteEntity> siteEntityList = query.getAreaCodeList().parallelStream().flatMap(areaId ->
-                            this.service.getFlatSitesByAreaCode(areaId, getContext()).stream()
-                    ).distinct().collect(Collectors.toList());
-                    model.put("data", siteEntityList);
-                } else {
-                    List<SiteEntity> result = this.getService().find(query, context);
-                    model.put("data", result);
-                }
+            } else {
+                List<SiteEntity> result = this.getService().find(query, context);
+                model.put("data", result);
             }
             model.put("message_info", busiDesc + "成功");
             this.recordSysLog(this.request, busiDesc + " 【成功】");

portal-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.base.login.web;
 
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.IAuthTokenService;
@@ -21,6 +22,7 @@ import com.mortals.xhx.module.menu.service.MenuService;
 import com.mortals.xhx.module.user.model.UserEntity;
 import com.mortals.xhx.module.user.service.UserService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.ArrayStack;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -72,24 +74,32 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
             List<MenuEntity> menuList = menuService.findTreeMenuByUser(userEntity);
             userEntity.setMenuList(menuList);
             data.put("user", userEntity);
-            if(StringUtils.isNotEmpty(userEntity.getAreaCodes())){
-                SitePdu sitePdu = new SitePdu();
-                List<String> areaCodeList = Arrays.asList(userEntity.getAreaCodes().split(","));
-                sitePdu.setAreaCodeList(areaCodeList);
-                String resp = apiModelFeign.getSitesByQuery(sitePdu);
-                ApiResp<JSONObject> apiResp = JSON.parseObject(resp, ApiResp.class);
-                if (apiResp.getCode() != YesNoEnum.YES.getValue()) {
-                    throw new AppException("获取用户站点列表树数据失败：" + apiResp.getMsg());
-                }
-                if(apiResp.getData().get("data")!=null) {
-                    data.put("siteList", apiResp.getData().get("data"));
+            if(userEntity.getId()==1){
+                JSONArray siteList = new JSONArray();
+                JSONObject siteObject = new JSONObject();
+                siteObject.put("id",0);
+                siteObject.put("siteName","无站点");
+                siteList.add(siteObject);
+                data.put("siteList", siteList);
+            }else {
+                if(StringUtils.isNotEmpty(userEntity.getAreaCodes())){
+                    SitePdu sitePdu = new SitePdu();
+                    List<String> areaCodeList = Arrays.asList(userEntity.getAreaCodes().split(","));
+                    sitePdu.setAreaCodeList(areaCodeList);
+                    String resp = apiModelFeign.getSitesByQuery(sitePdu);
+                    ApiResp<JSONObject> apiResp = JSON.parseObject(resp, ApiResp.class);
+                    if (apiResp.getCode() != YesNoEnum.YES.getValue()) {
+                        throw new AppException("获取用户站点列表树数据失败：" + apiResp.getMsg());
+                    }
+                    if(apiResp.getData().get("data")!=null) {
+                        data.put("siteList", apiResp.getData().get("data"));
+                    }else {
+                        data.put("siteList", Collections.emptyList());
+                    }
                 }else {
                     data.put("siteList", Collections.emptyList());
                 }
-            }else {
-                data.put("siteList", Collections.emptyList());
             }
-
             recordSysLog(request, userEntity, "用户登录系统成功!");
             ret.put(KEY_RESULT_DATA, data);
             ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);