From 71716f7fbc0ade41c1527d4f55f78eb70d27c406 Mon Sep 17 00:00:00 2001
From: fanghongchao <601470458@qq.com>
Date: Wed, 19 Dec 2018 16:13:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E6=B2=A1=E6=9C=89=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=97=B6=20=E6=89=8D=E8=BF=94=E5=9B=9E=E9=BB=98=E8=AE=A4UI?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/UISettingsController.java        | 45 ++++++++++---------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java b/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
index aa49202..a101ebc 100644
--- a/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
+++ b/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
@@ -89,38 +89,41 @@ public class UISettingsController {
 		   @RequestParam(required=false) String groupCode)
 	{
 		List<Uisettings> uisettingsList = new ArrayList<Uisettings>();
-		//将默认的ui设置放入内存
-		List<UisettingsDefault> uisettingsDefaultList = (List<UisettingsDefault>) uisettingsDefaultDao.findAll();
-		Map<String, UisettingsDto> defualtUiSettingsMap = new HashMap<String, UisettingsDto>();
-		if(null!=uisettingsDefaultList && uisettingsDefaultList.size()>0){
-			for(UisettingsDefault uisettingsDefault:uisettingsDefaultList){
-				defualtUiSettingsMap.put(uisettingsDefault.getGroupCode(), uisettingsConvert.uisettingsDefaultToUisettingsDto(uisettingsDefault));
-			}
-		}
-		
-		
-		if(!StringUtils.isEmpty(envCode) && !StringUtils.isEmpty(groupCode)){
+		Map<String, UisettingsDto> defualtUiSettingsMap = null;
+		//条件应该为并列
+		if(!StringUtils.isEmpty(envCode) && !StringUtils.isEmpty(groupCode)){ //双条件都存在
 			//包括envCode、groupCode条件
 			uisettingsList = uisettingsDao.findByEnvCodeAndGroupCodeAndUserid(envCode,groupCode,userService.getCurrentUserId());
-		}else if(StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)){
+		}
+		if(StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)){//双条件都为空
 			uisettingsList = uisettingsDao.findByUserid(userService.getCurrentUserId());
-		}else{
-			if (!StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)) {
-				//envCode条件s
-				uisettingsList = uisettingsDao.findByEnvCodeAndUserid(envCode,userService.getCurrentUserId());
-			}
-			if (StringUtils.isEmpty(envCode) && !StringUtils.isEmpty(groupCode)) {
-				//groupCode条件
-				uisettingsList = uisettingsDao.findByGroupCodeAndUserid(groupCode,userService.getCurrentUserId());
+			//条件都为空时 提供默认UI设置
+			//将默认的ui设置放入内存
+			List<UisettingsDefault> uisettingsDefaultList = (List<UisettingsDefault>) uisettingsDefaultDao.findAll();
+			defualtUiSettingsMap = new HashMap<String, UisettingsDto>();
+			if(null!=uisettingsDefaultList && uisettingsDefaultList.size()>0){
+				for(UisettingsDefault uisettingsDefault:uisettingsDefaultList){
+					defualtUiSettingsMap.put(uisettingsDefault.getGroupCode(), uisettingsConvert.uisettingsDefaultToUisettingsDto(uisettingsDefault));
+				}
 			}
 		}
+		if (!StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)) { //envCode非空  groupCode空
+			//envCode条件
+			uisettingsList = uisettingsDao.findByEnvCodeAndUserid(envCode,userService.getCurrentUserId());
+		}
+		if (StringUtils.isEmpty(envCode) && !StringUtils.isEmpty(groupCode)) { //envCode空  groupCode非空
+			//groupCode条件
+			uisettingsList = uisettingsDao.findByGroupCodeAndUserid(groupCode,userService.getCurrentUserId());
+		}
 		
 		//转换dto
 		List<UisettingsDto> uisettingsListDto = new ArrayList<UisettingsDto>();
 		if(null!=uisettingsList && uisettingsList.size()>0){
 			for(Uisettings u:uisettingsList){
 				uisettingsListDto.add(uisettingsConvert.uisettingsToUisettingsDto(u));
-				defualtUiSettingsMap.remove(u.getGroupCode());
+				if(null!=defualtUiSettingsMap && defualtUiSettingsMap.size()>0){
+					defualtUiSettingsMap.remove(u.getGroupCode());
+				}
 			}
 		}