feat:(feature/REQ-3581) 解决冲突

This commit is contained in:
李龙 2025-02-21 10:33:41 +08:00
parent b26be5fcb2
commit 06e1e1763e

View File

@ -1859,14 +1859,6 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
// this.validVisaChangeForm(this.buildVisaChangeApproveCreateReqByVisaId(req.getVisaId()));
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(UpdateVisaChangeReq req) {
ChangeRecord oldValue = this.getById(req.getVisaId());
Axssert.checkNonNull(oldValue, CHANGE_RECORD_NOT_FOUND);
ChangeRecord update = toUpdate(req, oldValue);
/**
* 查询变更签证集合
*/
@ -1932,6 +1924,14 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
return visaIds;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(UpdateVisaChangeReq req) {
ChangeRecord oldValue = this.getById(req.getVisaId());
Axssert.checkNonNull(oldValue, CHANGE_RECORD_NOT_FOUND);
ChangeRecord update = toUpdate(req, oldValue);
this.updateById(update);
}