|
|
@@ -121,18 +121,30 @@
|
|
|
<if test="zoneId != null">
|
|
|
and v.id in(select resource_id from imcs_z_zone_productionresource e where e.zone_id = #{zoneId})
|
|
|
</if>
|
|
|
- <if test="code == null and code != ''">
|
|
|
+ <if test="code != null and code != ''">
|
|
|
and v.code = #{code}
|
|
|
</if>
|
|
|
+ <if test="codes != null and codes != ''">
|
|
|
+ and v.code in (${codes})
|
|
|
+ </if>
|
|
|
+ <if test="cncProgram != null and cncProgram != ''">
|
|
|
+ and c.cnc_program = #{cncProgram}
|
|
|
+ </if>
|
|
|
<if test="name != null and name != ''">
|
|
|
and v.name like concat('%', #{name}, '%')
|
|
|
</if>
|
|
|
- <if test="ip == null and ip == ''">
|
|
|
+ <if test="ip != null and ip != ''">
|
|
|
and v.ip = #{ip}
|
|
|
</if>
|
|
|
- <if test="port == null and port == ''">
|
|
|
+ <if test="port != null and port != ''">
|
|
|
and v.port = #{port}
|
|
|
</if>
|
|
|
+ <if test="id != null and id != ''">
|
|
|
+ and v.id = #{id}
|
|
|
+ </if>
|
|
|
+ <if test="isAutoCode != null and isAutoCode != ''">
|
|
|
+ and v.is_auto_code = #{isAutoCode}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
|
|
|
|
laoyao