Compare commits

..

No commits in common. "06b71889e59f0b4fc19c4f2a52f3a30ef8e56635" and "e7bd033a7804fee7785a2bf40641c3923ed851ac" have entirely different histories.

View File

@ -43,7 +43,6 @@
so.so_status,
so.remark,
so.corp_id,
so.main_id,
so.corp_name,
so.dept_id,
so.create_time,
@ -68,7 +67,7 @@
and so.so_status = #{map.soStatus}
</if>
<if test="map.soStatus == null">
and (so.so_status != '06' or so.so_status is null)
and so.so_status != '06'
</if>
<if test="map.searchTimeArray != null and map.searchTimeArray.length > 0">
and (so.create_time between #{map.searchTimeArray[0]} and #{map.searchTimeArray[1]})
@ -85,9 +84,6 @@
<if test="map.userId != null and map.userId != ''">
and (so.user_id = #{map.userId})
</if>
<if test="map.mainId != null and map.mainId != ''">
and so.main_id = #{map.mainId}
</if>
order by so.create_time desc
</select>
<select id="selectCountNum" resultType="java.lang.Integer">