From 4f84b581444f8059019012bf82f193e65b655c77 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 24 Jan 2025 14:18:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E6=97=B6=E6=B7=BB=E5=8A=A0=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/oa/biz/hrhiredetails/HrHireDetailsService.java    | 2 +-
 .../com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.java   | 2 +-
 .../com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.xml    | 3 +++
 .../com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java  | 6 +++---
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetailsService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetailsService.java
index c9b63d895c..b8fbb105f3 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetailsService.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhiredetails/HrHireDetailsService.java
@@ -34,7 +34,7 @@ public class HrHireDetailsService extends MybatisBaseService<HrHireDetailsMapper
         list2.removeAll(Collections.singleton(null));
         if (!list2.isEmpty()) {
             list2.stream().forEach(v -> {
-                oaAppendixMapper.deleteByLinkSid(v.getSid());
+                oaAppendixMapper.deleteByLinkSid(v.getSid(), "文件");
                 deleteBySid(v.getSid());
             });
         }
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.java
index 6a8755a131..8f80d54d2b 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.java
@@ -38,7 +38,7 @@ public interface OaAppendixMapper extends BaseMapper<OaAppendix> {
     @Select("select * from oa_appendix where linkSid = #{linkSid}")
     List<OaAppendix> fetchByLinkSid(String linkSid);
 
-    int deleteByLinkSid(String sid);
+    int deleteByLinkSid(@Param("sid") String sid,@Param("fileType") String fileType);
 
     @Select("select * from oa_appendix where linkSid = #{linkSid} and fileType = #{fileType}")
     List<OaAppendix> fetchByLinkSid2(@Param("linkSid") String linkSid, @Param("fileType") String type);
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.xml
index d46f360e2b..12c1b3273e 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.xml
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.xml
@@ -8,5 +8,8 @@
         delete
         from oa_appendix
         where linkSid = #{sid}
+        <if test="fileType != null  and fileType != ''">
+            and fileType = #{fileType}
+        </if>
     </delete>
 </mapper>
\ No newline at end of file
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java
index 6edd1b0027..12151bab94 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java
@@ -43,8 +43,8 @@ public class OaAppendixService extends MybatisBaseService<OaAppendixMapper, OaAp
         return baseMapper.fetchByLinkSid(linkSid);
     }
 
-    public void saveOrUpdateFile(String sid, List<OaAppendix> oaAppendixList) {
-        baseMapper.deleteByLinkSid(sid);
+    public void saveOrUpdateFile(String sid, List<OaAppendix> oaAppendixList,String fileType) {
+        baseMapper.deleteByLinkSid(sid,fileType);
         if (!oaAppendixList.isEmpty()) {
             oaAppendixList.forEach(v -> {
                 baseMapper.insert(v);
@@ -79,7 +79,7 @@ public class OaAppendixService extends MybatisBaseService<OaAppendixMapper, OaAp
                 oaAppendixList.add(oaAppendix);
             }
         }
-        saveOrUpdateFile(sid, oaAppendixList);
+        saveOrUpdateFile(sid, oaAppendixList,fileType);
     }
 
     public List<String> selectByLinkSid(String sid) {