gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整用户管理导出文件后结束时间未填，默认填写当前时间

Browse Source
This commit is contained in:
leijun
2018-12-23 14:54:31 +08:00
parent 8f4a6d9ebe
commit a0e944b2ed
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
View File

@@ -422,20 +422,16 @@ public class UserManageController extends BaseController{
titleTime+=" "+msgProp.getProperty("config_time")+"："+DateUtils.formatDateTime(cfg.getSearch_create_time_start()); titleTime+=" "+msgProp.getProperty("config_time")+"："+DateUtils.formatDateTime(cfg.getSearch_create_time_start());
if(cfg.getSearch_create_time_end()!=null){ if(cfg.getSearch_create_time_end()!=null){
titleTime+="—"+DateUtils.formatDateTime(cfg.getSearch_create_time_end()); titleTime+="—"+DateUtils.formatDateTime(cfg.getSearch_create_time_end());
} }else {
}else{ titleTime+="—"+DateUtils.getDateTime();
if(cfg.getSearch_create_time_end()!=null){
titleTime+=" "+msgProp.getProperty("config_time")+"：—"+DateUtils.formatDateTime(cfg.getSearch_create_time_end());
} }
} }
if(cfg.getSearch_edit_time_start()!=null){ if(cfg.getSearch_edit_time_start()!=null){
titleTime+=" "+msgProp.getProperty("edit_time")+"："+DateUtils.formatDateTime(cfg.getSearch_edit_time_start()); titleTime+=" "+msgProp.getProperty("edit_time")+"："+DateUtils.formatDateTime(cfg.getSearch_edit_time_start());
if(cfg.getSearch_edit_time_end()!=null){ if(cfg.getSearch_edit_time_end()!=null){
titleTime+="—"+DateUtils.formatDateTime(cfg.getSearch_edit_time_end()); titleTime+="—"+DateUtils.formatDateTime(cfg.getSearch_edit_time_end());
} }else{
}else{ titleTime+="—"+DateUtils.getDateTime();
if(cfg.getSearch_edit_time_end()!=null){
titleTime+=" "+msgProp.getProperty("edit_time")+"：—"+DateUtils.formatDateTime(cfg.getSearch_edit_time_end());
} }
} }
return titleTime; return titleTime;