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

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java

@@ -137,7 +137,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                         || role.getRoleName().equals("部门长")) {
                     List<Integer> caseStatusList = new ArrayList<>();
                     caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
-                    caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION);
                     caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL);
                     caseApplication.setDeptHeadStatus(caseStatusList);
                 }
@@ -197,7 +196,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                     ||role.getRoleName().equals("部门长")){
 
                 caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
-                caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION);
                 caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL);
                 caseApplication.setDeptHeadStatus(caseStatusList);
             }

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

@@ -145,7 +145,7 @@
             <!--仲裁员-->
             <if test="userId != null and userId != ''">
                 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
                 instr (t.arbitrator_id,#{userId})>0)
             </if>
@@ -233,7 +233,7 @@
             <!--仲裁员-->
             <if test="userId != null and userId != ''">
                 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
                 instr (t.arbitrator_id,#{userId})>0)
             </if>