Commit 59d4c08d authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.13' into MVP1.7.13

parents 26f6c135 e149305f
......@@ -2150,9 +2150,16 @@
<include refid="where_getSocialRecordRoster_base"/>
<if test="tDispatchInfo != null">
<if test="tDispatchInfo.backFileFlag != null and tDispatchInfo.backFileFlag.trim() != '' and tDispatchInfo.backFileFlag.trim() != '--'">
AND a.BACK_FILE_FLAG = #{tDispatchInfo.backFileFlag} AND a.type ='0'
</if>
<if test='tDispatchInfo.backFileFlag != null and tDispatchInfo.backFileFlag.trim() == "--"'>
AND a.type ='1'
</if>
<if test="tDispatchInfo.ygsHandleStatus != null and tDispatchInfo.ygsHandleStatus.trim() != ''">
AND s.YGS_HANDLE_STATUS = #{tDispatchInfo.ygsHandleStatus}
</if>
<if test="tDispatchInfo.ysdHandleStatus != null and tDispatchInfo.ysdHandleStatus.trim() != ''">
AND s.YSD_HANDLE_STATUS = #{tDispatchInfo.ysdHandleStatus}
</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment