hu 5 meses atrás
pai
commit
abb2cb9442

+ 1 - 1
src/custom/restcontroller/webmanage/sale/accessoryorder/accessoryorder.java

@@ -152,7 +152,7 @@ public class accessoryorder extends Controller {
         RowsMap expressformrowsMap = expressformrows.toRowsMap("sa_orderid");
         //查询区域信息
         QuerySQL areaQuery = SQLFactory.createQuerySQL(this, "sa_salearea", "areanum","areaname","areafullname").setTableAlias("t1");
-        areaQuery.addJoinTable(JOINTYPE.inner, "sys_enterprise_tradefield ", "t2", "t2.sa_saleareaid = t1.sa_saleareaid");
+        areaQuery.addJoinTable(JOINTYPE.inner, "sys_enterprise_tradefield ", "t2", "t2.sa_saleareaid = t1.sa_saleareaid","sys_enterpriseid");
         areaQuery.setWhere("t2.sys_enterpriseid", rows.toArrayList("sys_enterpriseid"));
         Rows arearows = areaQuery.query();
         RowsMap arearowsrowsMap = arearows.toRowsMap("sys_enterpriseid");

+ 2 - 2
src/custom/restcontroller/webmanage/sale/sendrepair/sendrepair_pj.java

@@ -59,8 +59,8 @@ public class sendrepair_pj extends Controller {
 
         HashMap<Long, ItemPrice> itemPriceRowsMap = ItemPrice.getItemPrice(this, sys_enterpriseid,rows.toArrayList("itemid", new ArrayList<>()));
         for (Row row :rows){
-            if (itemPriceRowsMap.containsKey(row.getString("itemid"))) {
-                row.put("saleprice", itemPriceRowsMap.get(row.getString("itemid")).getPrice());
+            if (itemPriceRowsMap.containsKey(row.getLong("itemid"))) {
+                row.put("saleprice", itemPriceRowsMap.get(row.getLong("itemid")).getPrice());
             } else {
                 row.put("saleprice", 0);
             }