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

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

@@ -80,12 +80,20 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
                 List<CaseAttach> evidenceMaterialList = caseAttachMapper.queryAnnexPathByCaseId(id);
                 if (evidenceMaterialList != null && evidenceMaterialList.size() > 0) {
                     for (CaseAttach caseAttach : evidenceMaterialList) {
-                        String path = caseAttach.getAnnexName();
-                        String prefix = "/profile";
-                        int startIndex = path.indexOf(prefix);
-                        startIndex += prefix.length();
-                        String extractedPath = "/uploadPath" + path.substring(startIndex);
-                        caseAttach.setAnnexPath(extractedPath);
+                        //根据附件类型决定返回的路径
+                        Integer annexType = caseAttach.getAnnexType();
+                        if (annexType != 1){
+                            String path = caseAttach.getAnnexName();
+                            String prefix = "/profile";
+                            int startIndex = path.indexOf(prefix);
+                            startIndex += prefix.length();
+                            String extractedPath = "/uploadPath" + path.substring(startIndex);
+                            caseAttach.setAnnexPath(extractedPath);
+                        }else {
+                            String annexPath = caseAttach.getAnnexPath();
+                            String result = annexPath.replace("/home/ruoyi", "");
+                            caseAttach.setAnnexPath(result);
+                        }
                     }
                 }
                 caseDetailVO.setEvidenceMaterialList(evidenceMaterialList);