fix: merge

sop-business/src/main/resources/mapper/TBDeviceInOutMapper.xml

@@ -246,11 +246,9 @@
             <choose>
                 <when test="sopNo != null and sopNo != ''">
                     AND EXISTS(SELECT 1 FROM t_b_device_in_out tbdio WHERE tbdio.device_serial_no = sd.device_code AND tbdio.sop_no = #{sopNo})
-                    AND EXISTS(SELECT 1 FROM t_b_device_in_out tbdio WHERE tbdio.device_no = sd.device_code AND tbdio.sop_no = #{sopNo})
                 </when>
                 <otherwise>
                     AND EXISTS(SELECT 1 FROM t_b_device_in_out tbdio WHERE tbdio.device_serial_no = sd.device_code AND tbdio.service_id IS NULL)
-                    AND EXISTS(SELECT 1 FROM t_b_device_in_out tbdio WHERE tbdio.device_no = sd.device_code AND tbdio.service_id IS NULL)
                 </otherwise>
             </choose>
         </where>