Ver Fonte

报错修复

hu há 7 meses atrás
pai
commit
ef73a972b3

+ 0 - 1
src/custom/restcontroller/sale/creditbill/creditbilldetail.java

@@ -105,7 +105,6 @@ public class creditbilldetail extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid=t2.sys_enterpriseid and t1.siteid=t2.siteid","enterprisename","abbreviation","phonenumber");
         querySQL.addJoinTable(JOINTYPE.left, "sa_accountclass", "t3", "t1.sa_accountclassid=t3.sa_accountclassid and t1.siteid=t3.siteid and t3.isused=1","accountno","accountname");
         querySQL.setSiteid(siteid);
-        querySQL.setWhere("t1.status = '审核'");
         querySQL.setWhere("t1.sa_creditbillid",sa_creditbillid);
         querySQL.setWhere(where);
         querySQL.setPage(pageSize, pageNumber);

+ 3 - 3
src/custom/restcontroller/sale/itemgroup/itemgroup.java

@@ -201,7 +201,7 @@ public class itemgroup extends Controller {
 //        String sql = factory.getSQL();
 //        //System.out.println(sql);
 //        Rows rows = dbConnect.runSqlQuery(sql);
-        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_itemgroup", "sa_brandid", "ispriorityshow",
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_itemgroup", "sa_itemgroupid","sa_brandid", "ispriorityshow",
                 "istopping","changeby","createby","changedate","createdate","groupnum","itemno","groupname","tradefield","isonsale");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t2", "t1.itemno = t2.itemno AND t1.siteid = t2.siteid","itemid");
@@ -209,14 +209,14 @@ public class itemgroup extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t6", "t6.unitid = t2.unitid AND t6.siteid = t2.siteid","unitname");
         querySQL.setSiteid(siteid);
         querySQL.setWhere("t1.isonsale=1");
-        querySQL.setWhere("1.sa_itemgroupid",rowsgroupids.toArrayList("sa_itemgroupid", new ArrayList<Long>()));
+        querySQL.setWhere("t1.sa_itemgroupid",rowsgroupids.toArrayList("sa_itemgroupid", new ArrayList<Long>()));
         querySQL.setWhere("t1.sa_brandid",brandids.toArray());
         querySQL.setWhere(where);
         querySQL.setWhere(where1);
         querySQL.setPage(pageSize, pageNumber);
         querySQL.setOrderBy(pageSorting);
         Rows rows = querySQL.query();
-        ArrayList<Long> itemgroupids = rows.toArrayList("sa_itemgroupid", new ArrayList<Long>());
+        ArrayList<Long> itemgroupids = rows.toArrayList("sa_itemgroupid", new ArrayList<>());
         RowsMap itemgroupScemeRowsMap = Itemgroup.getItemgroupScemeid(this, itemgroupids);
 
         for (Row row2 : rows) {