|
|
@@ -330,16 +330,19 @@ public class FadGoods extends Controller {
|
|
|
|
|
|
ArrayList<Long> sys_enterpriseids = new ArrayList<Long>();
|
|
|
Long sys_enterpriseid = content.getLongValue("sys_enterpriseid");
|
|
|
+ if (sys_enterpriseid == -1) {
|
|
|
+ return getSucReturnObject().setData(new Rows()).toString();
|
|
|
+ }
|
|
|
sys_enterpriseids.add(sys_enterpriseid);
|
|
|
sys_enterpriseids.add(0L);
|
|
|
|
|
|
QuerySQL querySQL = SQLFactory.createQuerySQL(this, sa_fad,
|
|
|
- "sa_fadid", "name", "pricetype","price","price_deposit", "unitname")
|
|
|
+ "sa_fadid", "name", "pricetype", "price", "price_deposit", "unitname")
|
|
|
.setTableAlias("t1");
|
|
|
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sys_datatag", "t2", "t2.ownertable='sa_fad' and t2.ownerid=t1.sa_fadid and t2.siteid=t1.siteid");
|
|
|
querySQL.setSiteid(siteid);
|
|
|
- querySQL.setWhere("not EXISTS(SELECT 1 from sa_fad WHERE sys_enterpriseid="+sys_enterpriseid+" and parentid=t1.sa_fadid and siteid=t1.siteid)");
|
|
|
+ querySQL.setWhere("not EXISTS(SELECT 1 from sa_fad WHERE sys_enterpriseid=" + sys_enterpriseid + " and parentid=t1.sa_fadid and siteid=t1.siteid)");
|
|
|
querySQL.setWhere("sys_enterpriseid", sys_enterpriseids);
|
|
|
querySQL.setWhere("classid", 2);
|
|
|
querySQL.setWhere("isonsale", 1);
|