|
@@ -36,8 +36,8 @@
|
|
sys_user su ON tbdio.user_id = su.id
|
|
sys_user su ON tbdio.user_id = su.id
|
|
LEFT JOIN
|
|
LEFT JOIN
|
|
sys_supplier ss ON sd.supplier_id = ss.id
|
|
sys_supplier ss ON sd.supplier_id = ss.id
|
|
- <where> 1 = 1
|
|
|
|
- and IF(tbs.`status` = 'PUBLISH', 1 = 1, 1 <![CDATA[ <> ]]> 1)
|
|
|
|
|
|
+ <where>
|
|
|
|
+ AND (tbs.status = 'PUBLISH' OR tbdio.service_id IS NULL)
|
|
<if test="serviceUnitId != null">
|
|
<if test="serviceUnitId != null">
|
|
AND tbs.id = #{serviceUnitId}
|
|
AND tbs.id = #{serviceUnitId}
|
|
</if>
|
|
</if>
|
|
@@ -131,6 +131,7 @@
|
|
LEFT JOIN
|
|
LEFT JOIN
|
|
sys_supplier ss ON sd.supplier_id = ss.id
|
|
sys_supplier ss ON sd.supplier_id = ss.id
|
|
<where>
|
|
<where>
|
|
|
|
+ AND (tbs.status = 'PUBLISH' OR tbdio.service_id IS NULL)
|
|
<if test="serviceUnitId != null">
|
|
<if test="serviceUnitId != null">
|
|
AND tbs.id = #{serviceUnitId}
|
|
AND tbs.id = #{serviceUnitId}
|
|
</if>
|
|
</if>
|