|
|
@@ -1235,11 +1235,19 @@ public class SetlListUpldService {
|
|
|
} else if (param.getFlag() == UPLOADED) {
|
|
|
qw.isNotNull("a.setl_list_id");
|
|
|
}
|
|
|
- if (param.getAuditFlag() != All) {
|
|
|
- if(param.getAuditFlag() == 5){
|
|
|
- qw.isNull("c.audit_flag");
|
|
|
+ if (ListUtil.notBlank(param.getAuditFlag()) && !param.getAuditFlag().contains(All)) {
|
|
|
+ List<Integer> auditFlags = param.getAuditFlag();
|
|
|
+ if(auditFlags.stream().anyMatch(o->o==5)){
|
|
|
+ if(auditFlags.stream().allMatch(o->o==5)){
|
|
|
+ qw.isNull("c.audit_flag");
|
|
|
+ }else {
|
|
|
+ StringBuilder auditFlagSql = new StringBuilder();
|
|
|
+ List<Integer> neqFive = auditFlags.stream().filter(obj -> obj != 5).collect(Collectors.toList());
|
|
|
+ auditFlagSql.append(" (c.audit_flag is null or c.audit_flag in ("+CollUtil.join(neqFive,",")+") ) ");
|
|
|
+ qw.apply(auditFlagSql.toString());
|
|
|
+ }
|
|
|
}else {
|
|
|
- qw.eq("c.audit_flag", param.getAuditFlag());
|
|
|
+ qw.in("c.audit_flag",auditFlags);
|
|
|
}
|
|
|
}
|
|
|
|