车车 2 hónapja
szülő
commit
8d5ac59a22

+ 3 - 0
ktg-iscs/src/main/resources/mapper/IsIsolationPointMapper.xml

@@ -240,6 +240,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dto.lotoId != null and dto.lotoId == 0">
                 and p.loto_id is null
             </if>
+            <if test="dto.switchMapId != null and dto.switchMapId != 0">
+                and p.switch_map_id = #{dto.switchMapId}
+            </if>
             <if test="dto.switchMapId != null and dto.switchMapId == 0">
                 and p.switch_map_id is null
             </if>

+ 1 - 1
ktg-iscs/src/main/resources/mapper/IsMapPointMapper.xml

@@ -11,7 +11,7 @@
             CASE
                 WHEN p.map_type = "1" THEN
                     w.workstation_name
-                WHEN p.map_type = "2" THEN
+                WHEN p.map_type = "2" or p.map_type = "3" THEN
                     ip.point_name
                 END AS entity_name
         FROM