|
@@ -49,6 +49,7 @@
|
|
|
LEFT JOIN (
|
|
LEFT JOIN (
|
|
|
SELECT
|
|
SELECT
|
|
|
zp.resource_id,
|
|
zp.resource_id,
|
|
|
|
|
+ z.id zoneId,
|
|
|
z. NAME zoneName
|
|
z. NAME zoneName
|
|
|
FROM
|
|
FROM
|
|
|
imcs_z_zone z
|
|
imcs_z_zone z
|
|
@@ -64,7 +65,7 @@
|
|
|
</if>
|
|
</if>
|
|
|
where 1=1
|
|
where 1=1
|
|
|
<if test="zoneId != null">
|
|
<if test="zoneId != null">
|
|
|
- and v.id in(select resource_id from imcs_z_zone_productionresource e where e.zone_id = #{zoneId})
|
|
|
|
|
|
|
+ and a.zoneId = #{zoneId}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="code != null and code != ''">
|
|
<if test="code != null and code != ''">
|
|
|
and v.code = #{code}
|
|
and v.code = #{code}
|