From 7354bff9b7c45151da759da4829098d695585566 Mon Sep 17 00:00:00 2001
From: fanghongchao <601470458@qq.com>
Date: Thu, 13 Dec 2018 16:44:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=97=A7=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adminapi/controller/settings/UISettingsController.java   | 5 +----
 1 file changed, 1 insertion(+), 4 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 b7fcdb3..ca33646 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
@@ -147,13 +147,10 @@ public class UISettingsController {
 		//Dto转实体类
 		Uisettings uisettings = uisettingsConvert.uisettingsDtoToUisettings(uisettingsDto);
 		
-		Uisettings oldUisettings = null;
+		Uisettings oldUisettings = uisettingsDao.findOneByGroupCodeAndUserid(uisettingsDto.getGroupCode(), userService.getCurrentUserId());
 		String optType = CommCode.LOG_OPT_TYPE_ADD;
 		String oldData = "无";
 		//一个用户只能拥有一套UI 通过用户id 和 groupCode 获取旧的数据
-		if(!StringUtils.isEmpty(uisettings.getId())){
-			oldUisettings = uisettingsDao.findOneByGroupCodeAndUserid(uisettingsDto.getGroupCode(), userService.getCurrentUserId());
-		}
 		
 		if(null==oldUisettings)
 		{