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

Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev

Browse Source
This commit was merged in pull request #257.
This commit is contained in:
wangqiong123
2023-11-29 21:47:03 +08:00
committed by Gitea
parent ba86324276 0db3c4814d
commit 8816a64040
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+1
View File
@@ -198,6 +198,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
caseApplication.setFinanceStatus(CaseApplicationConstants.PENDING_PAYMENT_CONFIRM);
}
if ("法律顾问".equals(role.getRoleName())) {
// 秘书查看所有案件
// 查询角色有关的用户部门
List<Long> deptIds = new ArrayList<>();
deptIds.add(sysUser.getDeptId());
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+10 -10
View File
@@ -125,7 +125,7 @@
<!--仲裁员-->
<if test="userId != null and userId != ''">
or ( t.identity_type=1 and
t.case_status in (7,8,9,11,13,17)
t.case_status in (7,11,13,17)
and
instr (t.arbitrator_id,#{userId})>0)
</if>
@@ -316,14 +316,14 @@
WHERE
ca.identity_type=1
and c.case_status in (1,5,14,15,16,17,31)
and c.case_status in (1,5,8,9,14,15,16,17,31)
<if test="deptIds != null and deptIds.size() > 0">
<!-- <if test="deptIds != null and deptIds.size() > 0">
and ca.application_organ_id in
<foreach item="item" collection="deptIds" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</if>-->
<if test="lockStatus != null">
AND c.lock_status = #{lockStatus}
</if>
@@ -439,12 +439,12 @@
<!-- #{caseStatus}-->
<!-- </foreach>-->
<!-- </if>-->
<if test="deptIds != null and deptIds.size() > 0">
<!-- <if test="deptIds != null and deptIds.size() > 0">
and ca.application_organ_id in
<foreach item="item" collection="deptIds" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</if> -->
<!-- <if test="caseStatus != null">-->
<!-- AND c.case_status = #{caseStatus}-->
<!-- </if>-->
@@ -699,7 +699,7 @@
<!--仲裁员-->
<if test="userId != null and userId != ''">
or ( t.identity_type=1 and
t.case_status in (7,8,9,11,13,17)
t.case_status in (7,11,13,17)
and
instr (t.arbitrator_id,#{userId})>0)
</if>
@@ -791,13 +791,13 @@
WHERE case_appli_id = c.id
)
WHERE
ca.identity_type=1 and c.case_status in (1,5,14,15,16,17,31)
<if test="deptIds != null and deptIds.size() > 0">
ca.identity_type=1 and c.case_status in (1,5,8,9,14,15,16,17,31)
<!-- <if test="deptIds != null and deptIds.size() > 0">
and ca.application_organ_id in
<foreach item="item" collection="deptIds" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</if> -->
<if test="caseStatus != null">
AND c.case_status = #{caseStatus}
</if>