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 #179.
This commit is contained in:
wangqiong123
2023-11-02 15:36:30 +08:00
committed by Gitea
parent 178ff2a675 eba2773a9d
commit 5373f1fb42
2 changed files with 2 additions and 4 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
-2
View File
@@ -137,7 +137,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|| role.getRoleName().equals("部门长")) { || role.getRoleName().equals("部门长")) {
List<Integer> caseStatusList = new ArrayList<>(); List<Integer> caseStatusList = new ArrayList<>();
caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION);
caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL);
caseApplication.setDeptHeadStatus(caseStatusList); caseApplication.setDeptHeadStatus(caseStatusList);
} }
@@ -197,7 +196,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
||role.getRoleName().equals("部门长")){ ||role.getRoleName().equals("部门长")){
caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION);
caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL);
caseApplication.setDeptHeadStatus(caseStatusList); caseApplication.setDeptHeadStatus(caseStatusList);
} }
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+2 -2
View File
@@ -145,7 +145,7 @@
<!--仲裁员--> <!--仲裁员-->
<if test="userId != null and userId != ''"> <if test="userId != null and userId != ''">
or ( t.identity_type=1 and or ( t.identity_type=1 and
t.case_status in (7,8,9,12,13,14,17) t.case_status in (7,8,9,12,13,17)
and and
instr (t.arbitrator_id,#{userId})>0) instr (t.arbitrator_id,#{userId})>0)
</if> </if>
@@ -233,7 +233,7 @@
<!--仲裁员--> <!--仲裁员-->
<if test="userId != null and userId != ''"> <if test="userId != null and userId != ''">
or ( t.identity_type=1 and or ( t.identity_type=1 and
t.case_status in (7,8,9,12,13,14,17) t.case_status in (7,8,9,12,13,17)
and and
instr (t.arbitrator_id,#{userId})>0) instr (t.arbitrator_id,#{userId})>0)
</if> </if>