|
@@ -208,7 +208,7 @@ public class aftersalesmag extends Controller {
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t5.sys_enterpriseid=t4.sys_enterpriseid and t5.siteid=t4.siteid","contact","phonenumber","address");
|
|
querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t5.sys_enterpriseid=t4.sys_enterpriseid and t5.siteid=t4.siteid","contact","phonenumber","address");
|
|
|
querySQL.setSiteid(siteid);
|
|
querySQL.setSiteid(siteid);
|
|
|
querySQL.setWhere("t1.sa_agentsid in (select sa_agentsid from sa_agents where sys_enterpriseid="+sys_enterpriseid+")");
|
|
querySQL.setWhere("t1.sa_agentsid in (select sa_agentsid from sa_agents where sys_enterpriseid="+sys_enterpriseid+")");
|
|
|
- querySQL.setWhere("t1.sku not in (select machinecode from sa_aftersalesmag_items where siteid='"+siteid+"')");
|
|
|
|
|
|
|
+ querySQL.setWhere("t1.sku not in (select distinct machinecode from sa_aftersalesmag_items where siteid='"+siteid+"' and ifnull(machinecode,'')!='')");
|
|
|
querySQL.setWhere(where.toString());
|
|
querySQL.setWhere(where.toString());
|
|
|
querySQL.setDistinct(true);
|
|
querySQL.setDistinct(true);
|
|
|
querySQL.setPage(pageSize, pageNumber);
|
|
querySQL.setPage(pageSize, pageNumber);
|