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