Przeglądaj źródła

Merge remote-tracking branch 'origin/develop' into develop-green

eganwu 1 rok temu
rodzic
commit
b48a12f464

+ 1 - 1
src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -514,7 +514,7 @@ public class Item extends Controller {
         RowsMap itemclassRowsMap = ItemClass.getAllItemClassRowsMap(this, ids);
         for (Row row : rows) {
             if (attRowsMapCover.getOrDefault(row.getString("itemid"), new Rows()).isNotEmpty()) {
-                row.put("attinfos", attRowsMapCover);
+                row.put("attinfos", attRowsMapCover.getOrDefault(row.getString("itemid"), new Rows()));
             } else if (attRowsMap.getOrDefault(row.getString("itemid"), new Rows()).isNotEmpty()) {
                 row.put("attinfos", attRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
             } else {