From 911b105e3dd334c4ee70a36226a2ac96059a3db8 Mon Sep 17 00:00:00 2001
From: liaoxuwei <5789413@qq.com>
Date: Thu, 12 Jan 2023 15:42:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9admin=E8=B4=A6=E5=8F=B7?=
=?UTF-8?q?=E7=99=BB=E9=99=86=E6=97=B6=E4=B8=8D=E5=9C=A8=E5=8A=A0=E8=BD=BD?=
=?UTF-8?q?=E7=AB=99=E7=82=B9=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../xhx/module/site/web/SiteController.java | 23 ++++-------
.../xhx/base/login/web/LoginController.java | 38 ++++++++++++-------
2 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java b/base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
index e7a0c87c..92e62f76 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
+++ b/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 + " 銆愭垚鍔熴€�");
diff --git a/portal-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java b/portal-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
index 457b525b..c6a59ef8 100644
--- a/portal-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
+++ b/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(this.getCurUser().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);
--
2.24.3