feat(REQ-3300): 编辑状态下调用选择器需要返回不可选数据3
This commit is contained in:
parent
a58ba5e883
commit
eb4ec3161c
@ -1196,14 +1196,16 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
|
|||||||
|
|
||||||
// 单据选择器调用需要过滤掉待提报和已废止的记录
|
// 单据选择器调用需要过滤掉待提报和已废止的记录
|
||||||
if (Objects.nonNull(filter.getFrom()) && VisaChangePageSearchReq.FromEnum.SELECT.equals(filter.getFrom())) {
|
if (Objects.nonNull(filter.getFrom()) && VisaChangePageSearchReq.FromEnum.SELECT.equals(filter.getFrom())) {
|
||||||
queryChainWrapper.apply("CASE " +
|
// 编辑状态下调用单据选择器需要将已选的可能作废的单据返回
|
||||||
|
if (Objects.nonNull(filter.getVisaType())) {
|
||||||
|
queryChainWrapper.apply("CASE " +
|
||||||
"WHEN STATUS = 'TO_REPORT' THEN FALSE " +
|
"WHEN STATUS = 'TO_REPORT' THEN FALSE " +
|
||||||
"WHEN STATUS = 'FORBIDED' THEN FALSE " +
|
"WHEN STATUS = 'FORBIDED' THEN FALSE " +
|
||||||
"ELSE TRUE " +
|
"ELSE TRUE " +
|
||||||
"END");
|
"END");
|
||||||
// 需要将已选的可能作废的单据返回
|
queryChainWrapper.or().in(CollectionUtils.isNotEmpty(filter.getVisaIds()), ChangeRecord::getId, filter.getVisaIds());
|
||||||
queryChainWrapper.or().in(CollectionUtils.isNotEmpty(filter.getVisaIds()), ChangeRecord::getId, filter.getVisaIds());
|
return queryChainWrapper;
|
||||||
return queryChainWrapper;
|
}
|
||||||
}
|
}
|
||||||
queryChainWrapper.in(CollectionUtils.isNotEmpty(filter.getVisaIds()), ChangeRecord::getId, filter.getVisaIds());
|
queryChainWrapper.in(CollectionUtils.isNotEmpty(filter.getVisaIds()), ChangeRecord::getId, filter.getVisaIds());
|
||||||
return queryChainWrapper;
|
return queryChainWrapper;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user