SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

合并代码 #121

Merged
wangqiong123 merged 3 commits from wq into dev 2023-10-18 10:14:28 +00:00
Conversation 0 Commits 3 Files Changed 1
+61 -60
1 changed files with 61 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 10f7fffe10 - Show all commits
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+17 -16
View File
@@ -128,18 +128,19 @@
</if>
<!--财务-->
<if test="financeStatus != null and financeStatus != ''">
or ( t.identity_type=1 and t.case_status =#{financeStatus})
(t.identity_type=1 and t.case_status =#{financeStatus})
</if>
</where>
) t1
<!-- <where>-->
<!-- &lt;!&ndash;申请人&ndash;&gt;-->
<!-- <if test="nameId != null and nameId != ''">-->
<!-- and ( t1.application_organ_id = #{nameId} AND t1.identity_type=1-->
<!-- and t1.case_status in (0,2)-->
<!-- )-->
<!-- </if>-->
<!-- </where>-->
<!-- <where>-->
<!-- &lt;!&ndash;申请人&ndash;&gt;-->
<!-- <if test="nameId != null and nameId != ''">-->
<!-- and ( t1.application_organ_id = #{nameId} AND t1.identity_type=1-->
<!-- and t1.case_status in (0,2)-->
<!-- )-->
<!-- </if>-->
<!-- </where>-->
order by t1.create_time desc,t1.case_num desc
</select>
<select id="selectTodoCountByRole" resultType="com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount">
@@ -218,19 +219,19 @@
</foreach>)
</if>
<!--财务-->
<if test="financeStatus != null and financeStatus != ''">
or ( t.identity_type=1 and t.case_status =#{financeStatus})
( t.identity_type=1 and t.case_status =#{financeStatus})
</if>
</where>
) t1
<!-- <where>
&lt;!&ndash;申请人&ndash;&gt;-->
<!-- <if test="nameId != null and nameId != ''">-->
<!-- and ( t1.application_organ_id = #{nameId} AND t1.identity_type=1-->
<!-- and t1.case_status in (0,2)-->
<!-- )-->
<!-- </if>
<!-- <if test="nameId != null and nameId != ''">-->
<!-- and ( t1.application_organ_id = #{nameId} AND t1.identity_type=1-->
<!-- and t1.case_status in (0,2)-->
<!-- )-->
<!-- </if>
</where> -->
</select>