|
|
@@ -3691,9 +3691,11 @@ public class GoodsServiceImpl implements GoodsService {
|
|
|
}
|
|
|
if (goodsFilter.getStandard() != null) {
|
|
|
if (goodsFilter.getStandard()) {
|
|
|
- info.expression(PredicateUtils.isNotNull("uuid"));
|
|
|
+ info.expression(PredicateUtils.and(PredicateUtils.isNotNull("uuid"),
|
|
|
+ PredicateUtils.ne("uuid", StringConstant.BLANK, true)));
|
|
|
} else {
|
|
|
- info.expression(PredicateUtils.isNull("uuid"));
|
|
|
+ info.expression(PredicateUtils.or(PredicateUtils.isNull("uuid"),
|
|
|
+ PredicateUtils.eq("uuid", StringConstant.BLANK, true)));
|
|
|
}
|
|
|
}
|
|
|
if (goodsFilter.getAudited() != null) {
|