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

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

@@ -856,7 +856,8 @@
 
     <select id="selectAdminCaseApplicationListBatch" parameterType="CaseApplication" resultMap="CaseApplicationResult">
         SELECT DISTINCT c.batch_number ,c.arbitrat_method ,c.arbitrator_name ,
-        c.arbitrator_id  ,a.identity_type ,a.name ,
+        c.arbitrator_id  ,a.identity_type ,a.name ,a.application_organ_id as applicationOrganId,
+        a.application_organ_name  as applicantName,
         CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
         ELSE '无审理方式'
         END arbitratMethodName
@@ -866,6 +867,9 @@
         <if test="batchNumber != null and batchNumber != ''">
             AND c.batch_number = #{batchNumber}
         </if>
+        <if test="nameId != null and nameId != ''">
+            AND a.application_organ_id=#{nameId}
+        </if>
         order by  c.batch_number desc
     </select>