lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11-27-修改推荐审批文件操作

Browse Source
This commit is contained in:
青云
2025-11-27 18:56:33 +08:00
parent 1e01c53c52
commit 97079abdef
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectManagerApprovalServiceImpl.java
View File

@ -23,7 +23,6 @@ import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.domain.XzdProjectManagerApproval;
import org.dromara.xzd.domain.bo.XzdProjectManagerApprovalBo;
import org.dromara.xzd.domain.vo.XzdProjectManagerApprovalVo;
import org.dromara.xzd.domain.vo.XzdProjectVo;
import org.dromara.xzd.mapper.XzdProjectManagerApprovalMapper;
import org.dromara.xzd.service.IXzdProjectManagerApprovalService;
import org.springframework.beans.factory.annotation.Autowired;
@ -135,22 +134,22 @@ public class XzdProjectManagerApprovalServiceImpl extends ServiceImpl<XzdProject
XzdProjectManagerApprovalVo old = baseMapper.selectVoById(bo.getId());
//更新文件
if (bo.getFileId() != null && !bo.getFileId().isEmpty()){
if (old.getFileId() != null && !old.getFileId().isEmpty()) {
List<Long> oldFileId = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList();
List<Long> nowFileId = Arrays.stream(bo.getFileId().split(",")).map(Long::valueOf).toList();
for (Long l : oldFileId) {
if (!nowFileId.contains(l)) {
sysOssService.deleteWithValidByIds(List.of(l), false);
}
}
}
}else {
if (old.getFileId()!= null && !old.getFileId().isEmpty()){
List<Long> deleteIds = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList();
sysOssService.deleteWithValidByIds(deleteIds, false);
}
}
// if (bo.getFileId() != null && !bo.getFileId().isEmpty()){
// if (old.getFileId() != null && !old.getFileId().isEmpty()) {
// List<Long> oldFileId = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList();
// List<Long> nowFileId = Arrays.stream(bo.getFileId().split(",")).map(Long::valueOf).toList();
// for (Long l : oldFileId) {
// if (!nowFileId.contains(l)) {
// sysOssService.deleteWithValidByIds(List.of(l), false);
// }
// }
// }
// }else {
// if (old.getFileId()!= null && !old.getFileId().isEmpty()){
// List<Long> deleteIds = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList();
// sysOssService.deleteWithValidByIds(deleteIds, false);
// }
// }
XzdProjectManagerApproval update = MapstructUtils.convert(bo, XzdProjectManagerApproval.class);
validEntityBeforeSave(update);