合并代码 #121

Merged
wangqiong123 merged 3 commits from wq into dev 2023-10-18 10:14:28 +00:00
@@ -128,7 +128,8 @@
</if> </if>
<!--财务--> <!--财务-->
<if test="financeStatus != null and financeStatus != ''"> <if test="financeStatus != null and financeStatus != ''">
(t.identity_type=1 and t.case_status =#{financeStatus}) or (t.identity_type=1 and t.case_status =#{financeStatus})
</if> </if>
</where> </where>
@@ -220,7 +221,7 @@
</if> </if>
<!--财务--> <!--财务-->
<if test="financeStatus != null and financeStatus != ''"> <if test="financeStatus != null and financeStatus != ''">
( t.identity_type=1 and t.case_status =#{financeStatus}) or ( t.identity_type=1 and t.case_status =#{financeStatus})
</if> </if>
</where> </where>