From 24086fc2975e5255eb32b1c626e3178808c1164f Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 12 Aug 2024 14:22:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E4=BA=AB=E9=80=9A=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/customer/biz/crmfile/CrmFileMapper.java |  2 +-
 .../yxt/customer/biz/crmfile/CrmFileMapper.xml  |  2 +-
 .../customer/biz/crmfile/CrmFileService.java    | 17 ++++++++---------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/yxt/customer/biz/crmfile/CrmFileMapper.java b/src/main/java/com/yxt/customer/biz/crmfile/CrmFileMapper.java
index daedd1b..bf2290c 100644
--- a/src/main/java/com/yxt/customer/biz/crmfile/CrmFileMapper.java
+++ b/src/main/java/com/yxt/customer/biz/crmfile/CrmFileMapper.java
@@ -82,6 +82,6 @@ public interface CrmFileMapper extends BaseMapper<CrmFile> {
 	@Delete("DELETE FROM crm_appendix WHERE linkSid = #{linkSid} and attachType =#{attachType}")
 	int deleteFiles(@Param("linkSid") String linkSid,@Param("attachType") String attachType);
 
-	List<CommonAppendixVo> getPcAppendix(@Param("type") String type, @Param("linkSid") String linkSid, @Param("path") String path);
+	List<CommonAppendixVo> getPcAppendix(@Param("type") String type, @Param("linkSid") String linkSid);
 
 }
diff --git a/src/main/java/com/yxt/customer/biz/crmfile/CrmFileMapper.xml b/src/main/java/com/yxt/customer/biz/crmfile/CrmFileMapper.xml
index cf09700..29fcee5 100644
--- a/src/main/java/com/yxt/customer/biz/crmfile/CrmFileMapper.xml
+++ b/src/main/java/com/yxt/customer/biz/crmfile/CrmFileMapper.xml
@@ -62,7 +62,7 @@
 
     <select id="getPcAppendix" resultType="com.yxt.customer.biz.crmfile.CommonAppendixVo">
         SELECT cax.sid,
-               concat(#{path}, cax.filePath)           as filePath,
+               cax.filePath,
                cax.fileSize,
                cax.fileType,
                cax.attachType,
diff --git a/src/main/java/com/yxt/customer/biz/crmfile/CrmFileService.java b/src/main/java/com/yxt/customer/biz/crmfile/CrmFileService.java
index 315a317..f7052e3 100644
--- a/src/main/java/com/yxt/customer/biz/crmfile/CrmFileService.java
+++ b/src/main/java/com/yxt/customer/biz/crmfile/CrmFileService.java
@@ -249,11 +249,11 @@ public class CrmFileService extends MybatisBaseService<CrmFileMapper, CrmFile> {
             CrmFile commonAppendix = new CrmFile();
             dto.fillEntity(commonAppendix);
             String filePath = dto.getFilePath();
-            String a = fileUploadComponent.getUrlPrefix();
-            System.out.println("a============" + a);
-            if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-                filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
-            }
+//            String a = fileUploadComponent.getUrlPrefix();
+//            System.out.println("a============" + a);
+//            if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+//                filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+//            }
             commonAppendix.setFilePath(filePath);
             commonAppendix.setLinkSid(sid);
             commonAppendix.setCreateBySid(staffSid);
@@ -279,7 +279,7 @@ public class CrmFileService extends MybatisBaseService<CrmFileMapper, CrmFile> {
             commonAppendix.setFileType(pcCommonAppendixDto.getFileType());
             commonAppendix.setFileSize(pcCommonAppendixDto.getFileSize());
             commonAppendix.setAttachType(CommonAttachTypeEnum.WITNESS.getAttachType());
-            commonAppendix.setFilePath(pcCommonAppendixDto.getFilePath().replace(fileUploadComponent.getUrlPrefix(), ""));
+            commonAppendix.setFilePath(pcCommonAppendixDto.getFilePath());
             s += commonAppendix.getFilePath()+",";
             save(commonAppendix);
         }
@@ -304,8 +304,7 @@ public class CrmFileService extends MybatisBaseService<CrmFileMapper, CrmFile> {
     public List<CommonAppendixVo> getPcAppendix(CommonAppendixSelectQuery query) {
         String attachType = query.getAttachType();
         String linkSid = query.getLinkSid();
-        String urlPrefix = fileUploadComponent.getUrlPrefix();
-        return baseMapper.getPcAppendix(attachType,linkSid, urlPrefix);
+        return baseMapper.getPcAppendix(attachType,linkSid);
     }
 
     public void saveAppendix(String linkSid, String attachType, List<PcCommonAppendixDto> list) {
@@ -325,7 +324,7 @@ public class CrmFileService extends MybatisBaseService<CrmFileMapper, CrmFile> {
                 commonAppendix.setFileSize(pcCommonAppendixDto.getFileSize());
             }
             commonAppendix.setAttachType(attachType);
-            commonAppendix.setFilePath(pcCommonAppendixDto.getFilePath().replace(fileUploadComponent.getUrlPrefix(), ""));
+            commonAppendix.setFilePath(pcCommonAppendixDto.getFilePath());
             save(commonAppendix);
         }
     }