From fd54baf7a80479eec36967cc63e8c86385270ece Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Thu, 4 Jan 2024 17:28:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A1=B9=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E4=BF=AE=E6=94=B9BUG=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/op/device/mapper/EquCheckItemMapper.java   | 2 ++
 .../com/op/device/service/impl/EquCheckItemServiceImpl.java  | 2 +-
 .../src/main/resources/mapper/device/EquCheckItemMapper.xml  | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java
index 0e2a7297..72bdb7a3 100644
--- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java
+++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquCheckItemMapper.java
@@ -32,6 +32,8 @@ public interface EquCheckItemMapper {
 	 */
 	public List<EquCheckItem> selectEquCheckItemList(EquCheckItem equCheckItem);
 
+	public List<EquCheckItem> selectPrecisionEquCheckItemList(EquCheckItem equCheckItem);
+
 	/**
 	 * 新增检查项维护
 	 * 
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java
index af72ccf5..28685748 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquCheckItemServiceImpl.java
@@ -165,7 +165,7 @@ public class EquCheckItemServiceImpl implements IEquCheckItemService {
         EquCheckItem checkQuery = new EquCheckItem();
         checkQuery.setItemType(equCheckItemDTO.getItemType());
         checkQuery.setItemName(equCheckItemDTO.getItemName());
-        List<EquCheckItem> check = equCheckItemMapper.selectEquCheckItemList(checkQuery);
+        List<EquCheckItem> check = equCheckItemMapper.selectPrecisionEquCheckItemList(checkQuery);
         if (check.size()>0) {
             if (!check.get(0).getItemCode().equals(equCheckItemDTO.getItemCode())) {
                 return error(500,"检查项已存在！不可修改！");
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml
index c3f2095d..3a0f3808 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml
@@ -57,6 +57,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			ORDER BY create_time DESC
 		</where>
 	</select>
+
+	<select id="selectPrecisionEquCheckItemList" parameterType="EquCheckItem" resultMap="EquCheckItemResult">
+		<include refid="selectEquCheckItemVo"/>
+		where item_name = #{itemName} and item_type = #{itemType} and del_flag = '0'
+	</select>
 	
 	<select id="selectEquCheckItemByItemId" parameterType="String" resultMap="EquCheckItemResult">
 		<include refid="selectEquCheckItemVo"/>