From 6b73266c1b2634f11aecf7d03ed85db37c0391b5 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 30 Oct 2024 15:19:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?jar=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/controller/PurchaseBindController.java        | 2 +-
 pom.xml                                                    | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java
index 8428c749..daf5bbc1 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java
@@ -6,7 +6,7 @@ import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.core.web.page.TableDataInfo;
 import com.bonus.common.log.annotation.SysLog;
 import com.bonus.common.log.enums.OperaType;
-import com.bonus.common.security.annotation.PreventRepeatSubmit;
+import com.bonus.material.common.annotation.PreventRepeatSubmit;
 import com.bonus.common.security.annotation.RequiresPermissions;
 import com.bonus.material.purchase.dto.PurchaseDto;
 import com.bonus.material.purchase.service.IPurchaseBindService;
diff --git a/pom.xml b/pom.xml
index 8bb60932..043f9122 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,6 +164,13 @@
                 <version>${transmittable-thread-local.version}</version>
             </dependency>
 
+            <!-- 核心配置 -->
+            <dependency>
+                <groupId>com.bonus</groupId>
+                <artifactId>bonus-common-config</artifactId>
+                <version>${bonus.version}</version>
+            </dependency>
+
             <!-- 核心模块 -->
             <dependency>
                 <groupId>com.bonus</groupId>

From 61db23f773c048d3a8375014acc155a8b0f3ae01 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 30 Oct 2024 15:22:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=82=E5=AE=B6=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/ma/service/impl/SupplierInfoServiceImpl.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java
index 9c0e3b83..fb186112 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java
@@ -106,12 +106,13 @@ public class SupplierInfoServiceImpl implements ISupplierInfoService {
         try {
             int updatedSupplierInfoResult = supplierInfoMapper.updateSupplierInfo(supplierInfo);
             if (updatedSupplierInfoResult > 0) {
+                BmFileInfo bmFileInfoToDelete = new BmFileInfo();
+                bmFileInfoToDelete.setModelId(supplierInfo.getSupplierId());
+                bmFileInfoToDelete.setDicId(MaterialConstants.FILE_TYPE_YINGYEZHIZHAO);
+                bmFileInfoMapper.deleteBmFileInfoByBizInfo(bmFileInfoToDelete);
                 if (CollectionUtils.isEmpty(supplierInfo.getBmFileInfos())) {
                     return AjaxResult.success("修改任务成功,无营业执照附件");
                 }
-                BmFileInfo bmFileInfoToDelete = supplierInfo.getBmFileInfos().get(0);
-                bmFileInfoToDelete.setModelId(supplierInfo.getSupplierId());
-                bmFileInfoMapper.deleteBmFileInfoByBizInfo(bmFileInfoToDelete);
                 AtomicBoolean addFileInfoResult = new AtomicBoolean(false);
                 supplierInfo.getBmFileInfos().forEach(bmFileInfo -> {
                     bmFileInfo.setModelId(supplierInfo.getSupplierId());