wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-3300): 编辑状态下调用选择器需要返回不可选数据3

Browse Source
This commit is contained in:
chenwenjian 2025-02-21 18:10:37 +08:00
parent eb4ec3161c
commit 959761aa8b
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
View File

@ -126,6 +126,7 @@ import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
@ -1203,7 +1204,8 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
"WHEN STATUS = 'FORBIDED' THEN FALSE " +
"ELSE TRUE " +
"END");
queryChainWrapper.or().in(CollectionUtils.isNotEmpty(filter.getVisaIds()), ChangeRecord::getId, filter.getVisaIds());
queryChainWrapper.or().in(CollectionUtils.isNotEmpty(resetSelectVisaIds(filter)), ChangeRecord::getId, filter.getVisaIds());
return queryChainWrapper;
}
}
@ -1211,6 +1213,14 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
return queryChainWrapper;
}
private static Collection<Long> resetSelectVisaIds(VisaChangePageSearchReq filter) {
if (StringUtils.hasText(filter.getKeyword()) || CollectionUtils.isNotEmpty(filter.getStatuses()) || CollectionUtils.isNotEmpty(filter.getInitiators())) {
filter.setVisaIds(Collections.emptyList());
}
return filter.getVisaIds();
}
/**
* 获取权限的变更签证Id集合
*/