|
|
@@ -654,7 +654,7 @@
|
|
|
from achievement a
|
|
|
LEFT JOIN admin ad on a.id = a.tech_broker_id
|
|
|
LEFT JOIN user_identity ui on a.owner_id = ui.uid
|
|
|
- where deleted_sign = 0 and owner_type = 0
|
|
|
+ where a.deleted_sign = 0 and a.owner_type = 0
|
|
|
<if test="ownerId != null">
|
|
|
and a.owner_id = #{ownerId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
@@ -739,7 +739,7 @@
|
|
|
from achievement a
|
|
|
LEFT JOIN admin ad on a.id = a.tech_broker_id
|
|
|
LEFT JOIN organization_identity oi on a.owner_id = oi.uid
|
|
|
- where deleted_sign = 0 and owner_type = 1
|
|
|
+ where a.deleted_sign = 0 and a.owner_type = 1
|
|
|
<if test="ownerId != null">
|
|
|
and a.owner_id = #{ownerId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
@@ -762,7 +762,7 @@
|
|
|
and a.status = #{status,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
<if test="rStart != null">
|
|
|
- and a.release_date <![CDATA[ > ]]> #{rStart,jdbcType=TIMESTAMP}
|
|
|
+ and a.release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
|
|
|
</if>
|
|
|
<if test="rEnd != null">
|
|
|
and a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
|
|
|
@@ -803,7 +803,7 @@
|
|
|
and a.status = #{status,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
<if test="rStart != null">
|
|
|
- and a.release_date <![CDATA[ > ]]> #{rStart,jdbcType=TIMESTAMP}
|
|
|
+ and a.release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
|
|
|
</if>
|
|
|
<if test="rEnd != null">
|
|
|
and a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
|