Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into qtz5

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

@@ -124,7 +124,7 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
                     //查询案件详细信息
                     CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication);
                     if (caseApplication1 == null) {
-                        return AjaxResult.error();
+                       continue;
                     }
                     String caseName = "仲裁"; //这里案件名称表里未定义,暂时写死
                     String caseNum = caseApplication1.getCaseNum();
@@ -183,8 +183,6 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
                 casePaymentRecordMapper.update(casePaymentRecord);
                 // 新增日志
                 CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CASE_CROSSEXAMI, "");
-
-                return AjaxResult.success();
             }
         }
 

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

@@ -415,7 +415,12 @@ public class CaseZipImportImpl {
      * @param fatchRules    抓取规则
      */
     private void getFatchContent(Map<String, String> andConvertPDF, String mapKey, Map<String, String> map, List<FatchRule> fatchRules) {
-        String fileURL = andConvertPDF.get(mapKey);
+        String fileURL =null;
+        for (Map.Entry<String, String> entry : andConvertPDF.entrySet()) {
+            if(entry.getKey().contains(mapKey)){
+                fileURL=entry.getValue();
+            }
+        }
         if (StrUtil.isEmpty(fileURL)) {
             return;
         }