From 223eb21b48a7130d67ff743537d0e2ae65f760a9 Mon Sep 17 00:00:00 2001
From: tanghaihao <850814414@qq.com>
Date: Mon, 7 Aug 2023 10:49:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=BE=E5=A4=87=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=9C=BA=E7=BB=84=E6=9C=80=E5=A4=A7=E5=80=BC=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E5=88=A0=E9=99=A4=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.xml      | 2 +-
 .../java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.xml b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.xml
index db7e24d..d7be978 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.xml
+++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/mapper/EmInfoMapper.xml
@@ -117,7 +117,7 @@
 	</select>
 
     <select id="getMaxEmIndexByPid" resultType="java.lang.Integer">
-        select max(em_index) from hzims_em_info where DEPARTMENT = #{department} and em_grade = #{emGrade}
+        select max(em_index) from hzims_em_info where DEPARTMENT = #{department} and em_grade = #{emGrade} and is_deleted = 0
     </select>
 
     <select id="getSparePart" resultType="com.hnac.hzims.equipment.vo.SparePartVO">
diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java
index e2477b1..0624b01 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java
+++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java
@@ -552,6 +552,7 @@ public class EmInfoServiceImpl extends BaseServiceImpl<EmInfoMapper, EmInfoEntit
 		if (deviceResult.getCode() == 200 && Func.isNotEmpty(deviceResult.getData())) {
 			List<DeviceChildrenVO> deviceChildrenList = deviceResult.getData();
 			childrenMap = deviceChildrenList.stream().collect(Collectors.toMap(DeviceChildrenVO::getSignage, Function.identity()));
+			log.warn("设备信息查询巡检内容关联采集点信息：" + childrenMap);
 		}
 
 		// 拼接采集点到设备巡检内容