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

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAttach.java

@@ -42,6 +42,9 @@ public class  CaseAttach {
      * 用户账户
      */
     private String userName;
-
+    /**
+     * 印章状态(0未启用,1已启用)
+     */
+    private Integer sealStatus;
 
 }

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

@@ -131,7 +131,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
      * @param caseApplication
      * @return
      */
-//    @Override
+    @Override
     public List<CaseApplication> selectCaseApplicationListByRole(CaseApplication caseApplication) {
         // 获取登录用户
         LoginUser loginUser = getLoginUser();
@@ -2617,6 +2617,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     /**
      * 根据案件id查询已预约的会议
+     *
      * @param caseId
      * @return
      */

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

@@ -118,7 +118,7 @@
         applicantName,
         c.arbitrator_id,ca.identity_num , ca.identity_type,c.filearbitra_url,c.lock_status
         from case_application c
-        LEFT JOIN case_affiliate ca ON ca.case_appli_id = c.id
+        LEFT JOIN (select * from case_affiliate where application_organ_id is not null ) ca ON ca.case_appli_id = c.id
         <where>
             <if test="caseStatus != null">
                 AND c.case_status = #{caseStatus}

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

@@ -75,7 +75,7 @@
     </select>
 
     <select id="selectDeptIdentifylistother" parameterType="DeptIdentify" resultMap="DeptIdentifyResult">
-        SELECT d.id ,d.dept_id ,d.user_id,d.identify_status ,d.is_use ,d.sealName ,d.sealId ,d.annexId
+        SELECT d.id ,d.dept_id ,d.user_id,d.identify_status ,d.is_use ,d.seal_name ,d.seal_id ,d.annex_id
         from dept_identify d
         <where>
             <if test="identifyStatus != null">