From 1ab978fb3395110d4d831a812e3469c7140a06cf Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@zdjzhi.com>
Date: Fri, 28 Dec 2018 13:58:43 +0600
Subject: [PATCH] =?UTF-8?q?=EF=BC=881=EF=BC=89=E4=BF=AE=E5=A4=8D=E6=9D=A5?=
 =?UTF-8?q?=E5=87=BD=EF=BC=8C=E4=B8=93=E9=A1=B9=E4=BB=BB=E5=8A=A1=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E9=AA=8C=E8=AF=81=E6=8F=90=E7=A4=BA=E4=B8=BA=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=A4=B1=E8=B4=A5=20=EF=BC=882=EF=BC=89=E6=9D=A5?=
 =?UTF-8?q?=E5=87=BD=EF=BC=8C=E4=B8=93=E9=A1=B9=E4=BB=BB=E5=8A=A1=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E9=AA=8C=E8=AF=81=E6=8E=92=E9=99=A4=E5=A4=B1=E6=95=88?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/web/controller/basics/TaskInfoController.java | 3 ++-
 .../web/controller/configuration/RequestInfoController.java    | 3 ++-
 src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml | 2 +-
 src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml    | 2 +-
 src/main/resources/messages/message_en.properties              | 3 ++-
 src/main/resources/messages/message_ru.properties              | 3 ++-
 src/main/resources/messages/message_zh_CN.properties           | 3 ++-
 7 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java
index 59cfc7d21..1d2e298d9 100644
--- a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java
+++ b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java
@@ -77,7 +77,8 @@ public class TaskInfoController extends BaseController{
 			}else{
 				if (!"true".equals(checkTaskName(taskInfo.getTaskName()))){
 					logger.info(taskInfo.getTaskName()+"重复数据");
-					addMessage("error",model,"save_failed");
+					Properties props=this.getMsgProp();
+					addMessage("error",model,props.getProperty("duplicate", "Duplicate")+" "+props.getProperty("task_name", "Task Name"));
 					return form(taskInfo, model);
 				}
 				// 保存用户信息
diff --git a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
index 4b1239c34..ae3f0ce6d 100644
--- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
+++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
@@ -83,7 +83,8 @@ public class RequestInfoController extends BaseController{
 			}else{
 				if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){
 					logger.info(requestInfo.getRequestNumber()+"重复数据");
-					addMessage("error",model,"save_failed");
+					Properties props=this.getMsgProp();
+					addMessage("error",model,props.getProperty("duplicate", "Duplicate")+" "+props.getProperty("title", "Title"));
 					return form(requestInfo, model);
 				}
 				// 保存用户信息
diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
index 7f5f94cd3..8c0e0c100 100644
--- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
@@ -99,7 +99,7 @@
     select 
     <include refid="Base_Column_List" />
     from request_info
-    where request_number = #{requestNumber,jdbcType=VARCHAR}
+    where request_number = #{requestNumber,jdbcType=VARCHAR} and is_valid !=-1
   </select>
   <!-- 根据来id查询 -->
   <select id="getRequestInfoById" parameterType="java.lang.Long" resultMap="BaseResultMap">
diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
index d7e9b37ae..89ffda0ef 100644
--- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
@@ -96,7 +96,7 @@
     select 
     <include refid="Base_Column_List" />
     from task_info
-    where task_name = #{taskName,jdbcType=VARCHAR}
+    where task_name = #{taskName,jdbcType=VARCHAR} and is_valid !=-1
   </select>
   <!-- 根据来id查询 -->
   <select id="getTaskInfoById" parameterType="java.lang.Long" resultMap="BaseResultMap">
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 4ac9e3449..3502db054 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1432,4 +1432,5 @@ control_num=CONTROL
 contains_non_hex_char=Contains non-hexadecimal characters
 max_length=Maximum Length
 min_length=Minimum Length
-length_error=Length Error
\ No newline at end of file
+length_error=Length Error
+duplicate=Duplicate
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 5c47926be..871639b79 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1436,4 +1436,5 @@ control_num=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0423\
 contains_non_hex_char=Contains non-hexadecimal characters
 max_length=Maximum Length
 min_length=Minimum Length
-length_error=Length Error
\ No newline at end of file
+length_error=Length Error
+duplicate=Duplicate
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index aa202ad5f..3ad61cb92 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1432,4 +1432,5 @@ control_num=\u7ba1\u63a7\u6570\u91cf
 contains_non_hex_char=\u5305\u542b\u975e\u5341\u516d\u8fdb\u5236\u5b57\u7b26
 max_length=\u6700\u5927\u957F\u5EA6
 min_length=\u6700\u5C0F\u957F\u5EA6
-length_error=\u957F\u5EA6\u9519\u8BEF
\ No newline at end of file
+length_error=\u957F\u5EA6\u9519\u8BEF
+duplicate=\u91CD\u590D\u7684
\ No newline at end of file