|
|
@@ -1323,14 +1323,9 @@ public class OrderItems extends Controller {
|
|
|
itemquery.setWhere("t1.isonsale=1 and t1.isused=1");
|
|
|
}
|
|
|
itemquery.setWhere("t1.ismodule=0");
|
|
|
- if (sys_enterpriseid > 0 || !type.equals("特殊订单")) {
|
|
|
- itemquery.setWhere("t1.isonsale", true);
|
|
|
- } else if (content_where.containsKey("isonsale")) {
|
|
|
+ if (content_where.containsKey("isonsale")) {
|
|
|
itemquery.setWhere("t1.isonsale", content_where.getBooleanValue("isonsale"));
|
|
|
}
|
|
|
- if (!type.equals("特殊订单")) {
|
|
|
- itemquery.setWhere("t1.istool", false);
|
|
|
- }
|
|
|
if (iswuliao) {
|
|
|
itemquery.setWhere("t1.iswuliao", true);
|
|
|
}
|