Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
1e17f5a78e
|
|
@ -123,7 +123,7 @@
|
||||||
</delete>
|
</delete>
|
||||||
<!--删除边带设备-->
|
<!--删除边带设备-->
|
||||||
<delete id="delDeviceBdChildById">
|
<delete id="delDeviceBdChildById">
|
||||||
UPDATE tb_bd_device SET del_flage = 1 WHERE device_id = #{id}
|
UPDATE tb_bd_device SET del_flag = 1 WHERE device_id = #{id}
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<!--获取边带列表-->
|
<!--获取边带列表-->
|
||||||
|
|
@ -180,7 +180,7 @@
|
||||||
</select>
|
</select>
|
||||||
<!--边带设备是否包含子设备-->
|
<!--边带设备是否包含子设备-->
|
||||||
<select id="isHasChildDeviceBd" resultType="java.lang.Integer">
|
<select id="isHasChildDeviceBd" resultType="java.lang.Integer">
|
||||||
SELECT COUNT(*) FROM tb_bd_device WHERE bd_id = #{id} AND del_flage = 0
|
SELECT COUNT(*) FROM tb_bd_device WHERE bd_id = #{id} AND del_flag = 0
|
||||||
</select>
|
</select>
|
||||||
<!--获取边带子设备列表-->
|
<!--获取边带子设备列表-->
|
||||||
<select id="getDeviceBdChildList" resultType="com.securitycontrol.entity.background.vo.DeviceBdChildVo">
|
<select id="getDeviceBdChildList" resultType="com.securitycontrol.entity.background.vo.DeviceBdChildVo">
|
||||||
|
|
@ -212,7 +212,7 @@
|
||||||
<!--边带设备编码是否重复-->
|
<!--边带设备编码是否重复-->
|
||||||
<select id="isDeviceCodeExist" resultType="java.lang.Integer">
|
<select id="isDeviceCodeExist" resultType="java.lang.Integer">
|
||||||
<if test="deviceId == null or deviceId == ''">
|
<if test="deviceId == null or deviceId == ''">
|
||||||
SELECT COUNT(*) FROM tb_bd_device tbd WHERE device_code = #{deviceCode} AND del_flage = 0
|
SELECT COUNT(*) FROM tb_bd_device tbd WHERE device_code = #{deviceCode} AND del_flag = 0
|
||||||
</if>
|
</if>
|
||||||
<if test="deviceId != null and deviceId != ''">
|
<if test="deviceId != null and deviceId != ''">
|
||||||
SELECT COUNT(*) FROM tb_bd_device tbd WHERE device_code = #{deviceCode} AND device_id != #{deviceId} AND tbd.del_flag = 0
|
SELECT COUNT(*) FROM tb_bd_device tbd WHERE device_code = #{deviceCode} AND device_id != #{deviceId} AND tbd.del_flag = 0
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue