获取设备信息机组最大值添加是否删除字段逻辑

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">

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);
 		}
 
 		// 拼接采集点到设备巡检内容