Merge remote-tracking branch 'origin/master'

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());

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;

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>