|
|
@@ -15,7 +15,7 @@
|
|
|
and t.type_id = #{dto.type}
|
|
|
</if>
|
|
|
<if test="dto.type != null and dto.type = 1">
|
|
|
- and t.wf_status
|
|
|
+ and t.wf_status = 1
|
|
|
</if>
|
|
|
<if test="dto.authorName != null and dto.authorName != ''">
|
|
|
and t.author_name LIKE CONCAT('%',#{dto.authorName},'%')
|
|
|
@@ -48,6 +48,9 @@
|
|
|
<if test="dto.type != null and dto.type == 2 and dto.loginId != null and dto.loginId > 0">
|
|
|
and (t1.user_id = #{dto.loginId} or t.send_range = 1)
|
|
|
</if>
|
|
|
+ <if test="dto.type != null and dto.type = 1">
|
|
|
+ and t.wf_status = 1
|
|
|
+ </if>
|
|
|
<if test="dto.type != null and dto.type > 0">
|
|
|
and t.type_id = #{dto.type}
|
|
|
</if>
|