商品档案查询添加营销类别查询

src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -357,12 +357,12 @@ public class Item extends Controller {
             }
 
 
-            if (whereObject.containsKey("itemclassids") && !whereObject.getJSONArray("itemclassids").isEmpty()) {
-                if (whereObject.getJSONArray("itemclassids").size() > 0) {
-                    String sql = " and t1.itemid in ( SELECT itemid from sa_itemsaleclass WHERE itemclassid IN " + whereObject.getJSONArray("itemclassids") + "  and siteid='" + siteid + "')";
-                    sql = sql.replace("[", "(").replace("]", ")");
-                    where.append(sql);
-                }
+            if (whereObject.containsKey("itemclassid") &&  !"".equals(whereObject.getString("itemclassid"))) {
+                ArrayList<Long> list = ItemClass.getSubItemClassIds(this, whereObject.getLong("itemclassid"));
+                list.add(whereObject.getLong("itemclassid"));
+                String sql = " and t1.itemid in ( SELECT itemid from sa_itemsaleclass WHERE itemclassid IN " + list + "  and siteid='" + siteid + "')";
+                sql = sql.replace("[", "(").replace("]", ")");
+                where.append(sql);
             }
 
             if (whereObject.containsKey("tradefield") && !whereObject.getString("tradefield").isEmpty()) {