From bc1d69ad5f593553f7347683f6c15138e6c4f30b Mon Sep 17 00:00:00 2001 From: chenjinsong Date: Thu, 15 Nov 2018 11:52:22 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=8B=B1=E6=96=87=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=202.=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebRoot/i18n/globalMessages_en_US.properties | 8 ++++---- WebRoot/page/system/nmstaskmanager/nmstaskInfoList.jsp | 2 -- .../web/actions/nmstaskManager/NmsTaskManagerAction.java | 1 + 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/WebRoot/i18n/globalMessages_en_US.properties b/WebRoot/i18n/globalMessages_en_US.properties index 50937b4..1b44085 100644 --- a/WebRoot/i18n/globalMessages_en_US.properties +++ b/WebRoot/i18n/globalMessages_en_US.properties @@ -2419,7 +2419,7 @@ acnti.message.selectUsergroupDefault=Please select a user group acnti.text.parentMissionId=Original Task ID acnti.text.upgradeTime=Upgrade Time acnti.text.commandName=Command Name -acnti.text.commandDesc=Command Content    
or  See   +acnti.text.commandDesc=Command Content    
or  Parameters   acnti.text.addOperation=Add Operation acnti.text.missionDesc=Task Description acnti.text.users=Contacts @@ -2518,7 +2518,7 @@ acsnti.text.selectUserGroup=Please select a user group acsnti.text.upgrade_date=Upgrade Time acsnti.text.parentMissionId=Original Task ID acsnti.text.commandEName=Command Name -acsnti.text.commandComments=Command Content    
or  See   +acsnti.text.commandComments=Command Content    
or  Parameters   acsnti.text.addOperation=Add Operation acsnti.text.missionDesc=Task Description acsnti.text.users=Contacts @@ -2580,7 +2580,7 @@ asnti.button.back=Back asnti.message.commandType1=NC native support command asnti.message.commandType2=Executable command asnti.message.selectCommandNameDefault=Please select a command name -asnti.text.commandDesc=Command Content    
or  See   +asnti.text.commandDesc=Command Content    
or  Parameters   asnti.text.addPushFile=Adding a Push File asnti.message.addPushFile=The total size of the file must be less than 100MB asnti.text.addOperation=Add Operation @@ -3102,7 +3102,7 @@ anti.message.commandType1=NC native support command anti.message.commandType2=Executable command anti.text.commandexeName=Command Name anti.message.commandNameSelect=Please select the command name -anti.text.commandDesc=Command Content    
or  See   +anti.text.commandDesc=Command Content    
or  Parameters   anti.text.addPushFile=Add push File anti.message.addPushFile=The total size of the file must be less than 100MB anti.text.addOperation=Add Operation diff --git a/WebRoot/page/system/nmstaskmanager/nmstaskInfoList.jsp b/WebRoot/page/system/nmstaskmanager/nmstaskInfoList.jsp index ad68130..cd986f9 100644 --- a/WebRoot/page/system/nmstaskmanager/nmstaskInfoList.jsp +++ b/WebRoot/page/system/nmstaskmanager/nmstaskInfoList.jsp @@ -555,7 +555,6 @@ - @@ -635,7 +634,6 @@ ${missionstatetable.userIdName} - diff --git a/src/nis/nms/web/actions/nmstaskManager/NmsTaskManagerAction.java b/src/nis/nms/web/actions/nmstaskManager/NmsTaskManagerAction.java index 350cb33..4d476ef 100644 --- a/src/nis/nms/web/actions/nmstaskManager/NmsTaskManagerAction.java +++ b/src/nis/nms/web/actions/nmstaskManager/NmsTaskManagerAction.java @@ -4062,6 +4062,7 @@ public class NmsTaskManagerAction extends BaseAction { + this.getUserID() + "')= 0 " + " and instr(t.lookUserIds,to_char(t.userId))= 0) or (t.isLook ='0' and t.lookUserIds is null))"; } + hql += " and t.missionState!=-1"; hql += " order by t.createTime desc"; page = this.commonService.findByPage(hql, pageNo, this.getPageSize()); missionstateTableList = (List) page.getResult();