经销商查询保修卡时增加查询toagentnum的数据

src/custom/restcontroller/webmanage/sale/accessoryorder/accessoryorder.java

@@ -520,14 +520,15 @@ public class accessoryorder extends Controller {
             }
         }
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_warrantycard", "*");
-        querySQL.addJoinTable(JOINTYPE.inner, "sa_agents", "t2", "t1.sa_agentsid = t2.sa_agentsid AND t1.siteid = t2.siteid");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t2", "t1.sa_agentsid = t2.sa_agentsid AND t1.siteid = t2.siteid");
         querySQL.addJoinTable(JOINTYPE.inner, "plm_item", "t3", "t1.itemid = t3.itemid AND t1.siteid = t3.siteid", "itemno", "itemname", "model", "spec");
         querySQL.addJoinTable(JOINTYPE.inner, "sa_itemsku", "t4", "t1.sku = t4.sku AND t1.siteid = t4.siteid");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t6", "t1.toagentnum = t6.agentnum AND t1.siteid = t6.siteid");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t7", "t7.sys_enterpriseid = t6.sys_enterpriseid AND t7.siteid = t6.siteid");
         querySQL.addQueryFields("skucreatedate", "t4.createdate");
 
         querySQL.setWhere("t1.siteid", siteid);
-        querySQL.setWhere("t2.sys_enterpriseid", sys_enterpriseid);
-        querySQL.setWhere("t1.isvoid=0");
+        querySQL.setWhere("t1.isvoid=0 and (t2.sys_enterpriseid="+sys_enterpriseid+" or t7.sys_enterpriseid="+sys_enterpriseid+")");
         querySQL.setWhere(where.toString());
         querySQL.setPage(pageSize, pageNumber).setOrderBy(pageSorting).setTableAlias("t1");
         Rows rows = querySQL.query();

src/custom/restcontroller/webmanage/sale/warrantycard/warrantycard.java

@@ -28,7 +28,7 @@ public class warrantycard extends Controller {
     public String queryWarrantycardList() throws YosException {
         StringBuffer where = new StringBuffer(" 1=1 ");
         if (sys_enterpriseid > 0) {
-            where.append(" and t3.sys_enterpriseid ='" + sys_enterpriseid + "' ");
+            where.append(" and (t3.sys_enterpriseid ='" + sys_enterpriseid + "' or t7.sys_enterpriseid ='" + sys_enterpriseid + "' ) ");
         }
         if (content.containsKey("where")) {
             JSONObject whereObject = content.getJSONObject("where");
@@ -48,7 +48,7 @@ public class warrantycard extends Controller {
                 where.append(" and t1.sku ='" + whereObject.getString("sku") + "' ");
             }
             if (whereObject.containsKey("sys_enterpriseid") && !"".equals(whereObject.getString("sys_enterpriseid"))) {
-                where.append(" and t3.sys_enterpriseid ='" + whereObject.getString("sys_enterpriseid") + "' ");
+                where.append(" and (t3.sys_enterpriseid ='" + whereObject.getString("sys_enterpriseid") + "' or t7.sys_enterpriseid ='" + whereObject.getString("sys_enterpriseid") + "') ");
             }
         }
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_warrantycard", "*");