From 8a3a73b4f7dd94555e8cde840353212e8f575148 Mon Sep 17 00:00:00 2001
From: fanghongchao <601470458@qq.com>
Date: Wed, 19 Dec 2018 16:32:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E4=BC=A0=E5=80=BCgroupCode=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=89=BE=E4=B8=8D=E5=88=B0=E7=94=A8=E6=88=B7UI?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=EF=BC=8C=E8=BF=99=E4=BD=BF=E7=94=A8=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../history/HistoryFlightDataController.java  |  2 +-
 .../settings/UISettingsController.java        | 25 +++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/history/HistoryFlightDataController.java b/src/main/java/com/gzzn/omms/adminapi/controller/history/HistoryFlightDataController.java
index db41274..218ab3a 100644
--- a/src/main/java/com/gzzn/omms/adminapi/controller/history/HistoryFlightDataController.java
+++ b/src/main/java/com/gzzn/omms/adminapi/controller/history/HistoryFlightDataController.java
@@ -56,7 +56,7 @@ public class HistoryFlightDataController {
 			hitEndTime = DateUtils.swichTimeToEn_ddMMMyyHHmm(hstFLightTime +" 23:59:59");
 		}
 		
-		//历史创建使劲
+		//计划时间
 		boolQuery.must(QueryBuilders.rangeQuery("SODT")
 				.gte(hitStartTime).lte(hitEndTime));
 
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 a101ebc..51a90a3 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,7 +89,15 @@ public class UISettingsController {
 		   @RequestParam(required=false) String groupCode)
 	{
 		List<Uisettings> uisettingsList = new ArrayList<Uisettings>();
-		Map<String, UisettingsDto> defualtUiSettingsMap = null;
+		
+		//将默认的ui设置放入内存
+		Map<String, UisettingsDto> defualtUiSettingsMap = new HashMap<String, UisettingsDto>();
+		List<UisettingsDefault> uisettingsDefaultList = (List<UisettingsDefault>) uisettingsDefaultDao.findAll();
+		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条件
@@ -98,14 +106,6 @@ public class UISettingsController {
 		if(StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)){//双条件都为空
 			uisettingsList = uisettingsDao.findByUserid(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条件
@@ -128,7 +128,12 @@ public class UISettingsController {
 		}
 		
 		if(null!=defualtUiSettingsMap && defualtUiSettingsMap.size()>0){
-			uisettingsListDto.addAll(defualtUiSettingsMap.values());
+			if(StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)){//双条件都为空
+				uisettingsListDto.addAll(defualtUiSettingsMap.values());
+			}
+			if(!StringUtils.isEmpty(groupCode)){//groupCode 存在时
+				uisettingsListDto.add(defualtUiSettingsMap.get(groupCode));
+			}
 		}
 		
 		return ResponseDto.success(uisettingsListDto);