bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
jjLv 2024-10-30 15:42:27 +08:00
parent c32a3ee290 61db23f773
commit a2f77c7200
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/SupplierInfoServiceImpl.java
View File

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

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java
View File

@ -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;

7
pom.xml
View File

@ -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>