|
|
@@ -283,13 +283,14 @@ public class ProductServiceImpl implements ProductService {
|
|
|
page.filter("standard", (short)0);
|
|
|
page.filter("b2cEnabled", (short) 1);
|
|
|
} else if (type.contains("all")) {
|
|
|
- SimpleExpression[] arr = new SimpleExpression[2];
|
|
|
- arr[0] = PredicateUtils.eq("b2cEnabled", (short) 1, false);
|
|
|
- arr[1] = PredicateUtils.eq("standard", (short) 1, false);
|
|
|
- LogicalExpression logicalExpression = PredicateUtils.and(arr);
|
|
|
- SimpleExpression standard = PredicateUtils.eq("standard", (short) 0, false);
|
|
|
- page.orExpression(standard);
|
|
|
- page.orExpression(logicalExpression);
|
|
|
+// SimpleExpression[] arr = new SimpleExpression[2];
|
|
|
+// arr[0] = PredicateUtils.eq("b2cEnabled", (short) 1, false);
|
|
|
+// arr[1] = PredicateUtils.eq("standard", (short) 1, false);
|
|
|
+// LogicalExpression logicalExpression = PredicateUtils.and(arr);
|
|
|
+// SimpleExpression standard = PredicateUtils.eq("standard", (short) 0, false);
|
|
|
+// page.orExpression(standard);
|
|
|
+// page.orExpression(logicalExpression);
|
|
|
+ page.filter("b2cEnabled", (short) 1);
|
|
|
page.sorting("createTime", Sort.Direction.DESC);
|
|
|
}
|
|
|
|