From a0e944b2edbf2a0da33358ed753342b8dcbb37e6 Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Sun, 23 Dec 2018 14:54:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8E=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E6=97=B6=E9=97=B4=E6=9C=AA=E5=A1=AB=EF=BC=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=A1=AB=E5=86=99=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenance/UserManageController.java            | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
index 56302cafb..1fccb9aaa 100644
--- a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
+++ b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
@@ -422,20 +422,16 @@ public class UserManageController  extends BaseController{
 				titleTime+="  "+msgProp.getProperty("config_time")+"："+DateUtils.formatDateTime(cfg.getSearch_create_time_start());
 				if(cfg.getSearch_create_time_end()!=null){
 					titleTime+="—"+DateUtils.formatDateTime(cfg.getSearch_create_time_end());
-				}
-			}else{
-				if(cfg.getSearch_create_time_end()!=null){
-					titleTime+=" "+msgProp.getProperty("config_time")+"：—"+DateUtils.formatDateTime(cfg.getSearch_create_time_end());
+				}else {
+					titleTime+="—"+DateUtils.getDateTime();
 				}
 			}
 			if(cfg.getSearch_edit_time_start()!=null){
 				titleTime+=" "+msgProp.getProperty("edit_time")+"："+DateUtils.formatDateTime(cfg.getSearch_edit_time_start());
 				if(cfg.getSearch_edit_time_end()!=null){
 					titleTime+="—"+DateUtils.formatDateTime(cfg.getSearch_edit_time_end());
-				}
-			}else{
-				if(cfg.getSearch_edit_time_end()!=null){
-					titleTime+=" "+msgProp.getProperty("edit_time")+"：—"+DateUtils.formatDateTime(cfg.getSearch_edit_time_end());
+				}else{
+					titleTime+="—"+DateUtils.getDateTime();
 				}
 			}
 			return titleTime;