From 1b3ee67f4c9b52bcb81a0120daf52b457bd791d5 Mon Sep 17 00:00:00 2001
From: leijun <leijun@nismail.iie.ac.cn>
Date: Wed, 10 Oct 2018 15:29:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=92=8C=E8=BF=90=E8=90=A5?=
 =?UTF-8?q?=E5=95=86=E7=AE=A1=E7=90=86=E7=9A=84itemcode=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=B1=BB=E5=9E=8B=E4=B8=8B=E7=9A=84=E6=9C=89?=
 =?UTF-8?q?=E6=95=88=E9=85=8D=E7=BD=AE=EF=BC=8Citemcode=E4=B8=8D=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/basics/SysDictInfoController.java   |  7 +++++--
 .../java/com/nis/web/dao/basics/SysDictInfoDao.java    |  2 +-
 .../java/com/nis/web/dao/basics/SysDictInfoDao.xml     | 10 ++++++++--
 .../com/nis/web/service/basics/SysDictInfoService.java |  4 ++--
 src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp   |  2 +-
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
index dc4ac98fd..d64e0ad20 100644
--- a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
+++ b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
@@ -234,13 +234,16 @@ public class SysDictInfoController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "isItemCodeRepeat")
-	public boolean isItemCodeRepeat(String itemCode,String oldItemCode) {
+	public boolean isItemCodeRepeat(String itemCode,String oldItemCode,String itType) {
 		List<SysDictInfo> list = Lists.newArrayList();
 		if(oldItemCode!=null&&itemCode.trim().equals(oldItemCode.trim())){
 			return true;
 		}
 		if(!StringUtil.isEmpty(itemCode)){
-			list = sysDictInfoService.findByItemCode(itemCode);
+			SysDictInfo dict=new SysDictInfo();
+			dict.setItemCode(itemCode);
+			dict.setItemType(Integer.valueOf(itType));
+			list = sysDictInfoService.findByItemCode(dict);
 		}
 		if(list==null||list.size()==0){
 			return true;
diff --git a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java
index dd2daa119..47019b622 100644
--- a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java
+++ b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java
@@ -55,7 +55,7 @@ public interface SysDictInfoDao extends CrudDao<SysDictInfo> {
 	 * @param itemCode
 	 * @return
 	 */
-	List<SysDictInfo> findByItemCode(String itemCode);
+	List<SysDictInfo> findByItemCode(@Param("sysDictInfo")SysDictInfo sysDictInfo);
 
 	/**
 	 * 根据上级id选出所有下级
diff --git a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml
index 9521430ae..a77b242e9 100644
--- a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml
@@ -232,10 +232,16 @@
   
       <!-- 根据itemCode查询字典对象列表 -->
   
-  <select id="findByItemCode" resultType="com.nis.domain.basics.SysDictInfo">
+  <select id="findByItemCode" resultMap="dictResultMap">
   select 
   <include refid="sysDictInfoColumns"/>
-  from sys_dict_info s where s.item_code = #{itemCode}
+  from sys_dict_info s where s.is_valid = 1 
+  <if test="sysDictInfo.itemType != null and sysDictInfo.itemType != '' " >
+      AND s.item_type = ${sysDictInfo.itemType}
+    </if>
+    <if test="sysDictInfo.itemCode != null and sysDictInfo.itemCode != '' " >
+      AND s.item_code = ${sysDictInfo.itemCode}
+    </if>
   </select>
   
       <!-- 根据上级id选出所有下级 -->
diff --git a/src/main/java/com/nis/web/service/basics/SysDictInfoService.java b/src/main/java/com/nis/web/service/basics/SysDictInfoService.java
index 3b0fb65df..4e343cfbd 100644
--- a/src/main/java/com/nis/web/service/basics/SysDictInfoService.java
+++ b/src/main/java/com/nis/web/service/basics/SysDictInfoService.java
@@ -206,8 +206,8 @@ public class SysDictInfoService extends BaseService{
 	 * @param itemCode
 	 * @return
 	 */
-	public List<SysDictInfo> findByItemCode(String itemCode) {
-		return sysDictInfoDao.findByItemCode(itemCode);
+	public List<SysDictInfo> findByItemCode(SysDictInfo sysDictInfo) {
+		return sysDictInfoDao.findByItemCode(sysDictInfo);
 	}
 	/**
 	 * 根据上级id选出所有下级
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
index f8c2c39eb..476d21819 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
@@ -61,7 +61,7 @@
 			validateForm = $("#inputForm").validate({
 				rules: {
 					'itemCode':{
-						remote:'${ctx}/basics/sysDictInfo/isItemCodeRepeat?oldItemCode=${sysDictInfo.itemCode}'
+						remote:'${ctx}/basics/sysDictInfo/isItemCodeRepeat?oldItemCode=${sysDictInfo.itemCode}&itType=${itType}'
 					},
 					'itemType':{
 						remote:'${ctx}/basics/sysDictInfo/ajaxChildrenType?parent=${sysDictInfo.sysDictId}'