Merge branch 'develop' into develop2

src/custom/beans/Item/Item.java

@@ -1,5 +1,6 @@
 package beans.Item;
 
+import beans.attachment.Attachment;
 import common.BaseClass;
 import common.Controller;
 import common.YosException;
@@ -35,4 +36,13 @@ public class Item extends BaseClass {
         Rows rows = controller.dbConnect.runSqlQuery(sqlFactory);
         return rows;
     }
+
+
+    public static Rows getItemdefaultImage(Controller controller) throws YosException {
+        Rows siteRows = controller.dbConnect.runSqlQuery("select siteuid from sys_site where siteid='" + controller.siteid + "'");
+        if (siteRows.isNotEmpty()) {
+            return Attachment.get(controller, "sys_site", siteRows.get(0).getLong("siteuid"), "defaultImage");
+        }
+        return new Rows();
+    }
 }

src/custom/restcontroller/sale/favorites/favorites.java

@@ -1,5 +1,6 @@
 package restcontroller.sale.favorites;
 
+import beans.Item.Item;
 import beans.customscheme.CustomScheme;
 import beans.itemprice.ItemPrice;
 import com.alibaba.fastjson.JSONArray;
@@ -161,7 +162,7 @@ public class favorites extends Controller {
         ArrayList<Long> ids = itemrows.toArrayList("itemid", new ArrayList<>());
 
         //默认商品图片
-        Rows defaultImageRows = getAttachmentUrl("system", (long) 1, "defaultImage");
+        Rows defaultImageRows = Item.getItemdefaultImage(this);
         // 封面cover
         RowsMap coverRowsMap = getAttachmentUrl("plm_item", ids, "cover");
         // 附件

src/custom/restcontroller/sale/itemgroup/itemgroup.java

@@ -1,5 +1,6 @@
 package restcontroller.sale.itemgroup;
 
+import beans.Item.Item;
 import beans.datatag.DataTag;
 import beans.enterprise.Enterprise;
 import beans.itemclass.ItemClass;
@@ -257,7 +258,7 @@ public class itemgroup extends Controller {
         RowsMap itemRowsMap = itemrows.toRowsMap("itemid");
 
         //默认商品图片
-        Rows defaultImageRows = getAttachmentUrl("system", (long) 1, "defaultImage");
+        Rows defaultImageRows = Item.getItemdefaultImage(this);
         // 封面cover
         RowsMap coverRowsMap = getAttachmentUrl("plm_item", ids, "cover");
         // 附件
@@ -348,7 +349,7 @@ public class itemgroup extends Controller {
         ArrayList<Long> ids = rows.toArrayList("itemid", new ArrayList<>());
 
         //默认商品图片
-        Rows defaultImageRows = getAttachmentUrl("system", (long) 1, "defaultImage");
+        Rows defaultImageRows = Item.getItemdefaultImage(this);
         // 封面cover
         RowsMap coverRowsMap = getAttachmentUrl("plm_item", ids, "cover");
         // 附件
@@ -1006,7 +1007,7 @@ public class itemgroup extends Controller {
         ArrayList<Long> ids = itemrows.toArrayList("itemid", new ArrayList<>());
 
         //默认商品图片
-        Rows defaultImageRows = getAttachmentUrl("system", (long) 1, "defaultImage");
+        Rows defaultImageRows = Item.getItemdefaultImage(this);
         // 封面cover
         RowsMap coverRowsMap = getAttachmentUrl("plm_item", ids, "cover");
         // 附件

src/custom/restcontroller/sale/promotion/promotion.java

@@ -1,5 +1,6 @@
 package restcontroller.sale.promotion;
 
+import beans.Item.Item;
 import beans.customscheme.CustomScheme;
 import beans.salearea.SaleArea;
 import com.alibaba.fastjson.JSONArray;
@@ -46,7 +47,7 @@ public class promotion extends Controller {
         sqlFactory.addParameter_SQL("where", where);
         Rows rows = dbConnect.runSqlQuery(sqlFactory);
         //默认商品图片
-        Rows defaultImageRows = getAttachmentUrl("system", (long) 1, "defaultImage");
+        Rows defaultImageRows = Item.getItemdefaultImage(this);
         //附件
         ArrayList<Long> ids = rows.toArrayList("sa_promotionid", new ArrayList<>());
         RowsMap attRowsMap = getAttachmentUrl("sa_promotion", ids);
@@ -149,7 +150,7 @@ public class promotion extends Controller {
 
         ArrayList ids = rows.toArrayList("itemid", new ArrayList<>());
         //默认商品图片
-        Rows defaultImageRows = getAttachmentUrl("system", (long) 1, "defaultImage");
+        Rows defaultImageRows = Item.getItemdefaultImage(this);
         // 附件
         RowsMap attRowsMap = getAttachmentUrl("plm_item", ids);
         //商品领域
@@ -213,7 +214,7 @@ public class promotion extends Controller {
         sqlFactory.addParameter_SQL("where", where);
         Rows rows = dbConnect.runSqlQuery(sqlFactory);
         //默认商品图片
-        Rows defaultImageRows = getAttachmentUrl("system", (long) 1, "defaultImage");
+        Rows defaultImageRows = Item.getItemdefaultImage(this);
         //附件
         ArrayList<Long> ids = rows.toArrayList("sa_promotionid", new ArrayList<>());
         RowsMap attRowsMap = getAttachmentUrl("sa_promotion", ids);
@@ -303,7 +304,7 @@ public class promotion extends Controller {
 
         ArrayList ids = rows.toArrayList("itemid", new ArrayList<>());
         //默认商品图片
-        Rows defaultImageRows = getAttachmentUrl("system", (long) 1, "defaultImage");
+        Rows defaultImageRows = Item.getItemdefaultImage(this);
         // 附件
         RowsMap attRowsMap = getAttachmentUrl("plm_item", ids);
         //商品领域

src/custom/restcontroller/sale/shoppingcart/ShoppingCart.java

@@ -1,5 +1,6 @@
 package restcontroller.sale.shoppingcart;
 
+import beans.Item.Item;
 import beans.customscheme.CustomScheme;
 import beans.datacontrllog.DataContrlLog;
 import beans.itemprice.ItemPrice;
@@ -286,7 +287,7 @@ public class ShoppingCart extends Controller {
         ArrayList<Long> ids = rows.toArrayList("itemid", new ArrayList<>());
 
         //默认商品图片
-        Rows defaultImageRows = getAttachmentUrl("system", (long) 1, "defaultImage");
+        Rows defaultImageRows = Item.getItemdefaultImage(this);
         //附件
         RowsMap attRowsMap = getAttachmentUrl("plm_item", ids);
         //商品领域

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

@@ -2,6 +2,7 @@ package restcontroller.webmanage.sale.brand;
 
 import java.util.ArrayList;
 
+import beans.Item.Item;
 import com.alibaba.fastjson.JSONObject;
 
 import common.Controller;
@@ -92,7 +93,7 @@ public class brand extends Controller{
 
         ArrayList<Long> ids = rows.toArrayList("sa_brandid", new ArrayList<>());
         //默认商品图片
-      	Rows defaultImageRows = getAttachmentUrl("system", (long) 1, "defaultImage");
+      	Rows defaultImageRows = Item.getItemdefaultImage(this);
         //封面cover
         RowsMap coverRowsMap = getAttachmentUrl("sa_brand", ids, "cover");
         //附件

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

@@ -320,7 +320,7 @@ public class Item extends Controller {
         sqlFactory.addParameter("itemid", itemid);
         Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL(false));
         // 默认商品图片
-        Rows defaultImageRows = getAttachmentUrl("system", (long) 1, "defaultImage");
+        Rows defaultImageRows = beans.Item.Item.getItemdefaultImage(this);
         // 品牌
         RowsMap brandRowsMap = Brand.getBrandRowsMap(this, itemids);
         // 营销类别
@@ -527,7 +527,7 @@ public class Item extends Controller {
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
         // 默认商品图片
-        Rows defaultImageRows = getAttachmentUrl("system", (long) 1, "defaultImage");
+        Rows defaultImageRows = beans.Item.Item.getItemdefaultImage(this);
         // 附件
         ArrayList<Long> ids = rows.toArrayList("itemid", new ArrayList<>());
         RowsMap attRowsMapCover = getAttachmentUrl("plm_item", ids, "cover");
@@ -980,7 +980,7 @@ public class Item extends Controller {
         ArrayList<Long> ids = rows.toArrayList("plm_technicalinfoid", new ArrayList<>());
 
         // 默认商品图片
-        Rows defaultImageRows = getAttachmentUrl("system", (long) 1, "defaultImage");
+        Rows defaultImageRows = beans.Item.Item.getItemdefaultImage(this);
         // 封面cover
         RowsMap coverRowsMap = getAttachmentUrl("plm_technicalinfo", ids, "cover");
         // 附件

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

@@ -1,5 +1,6 @@
 package restcontroller.webmanage.sale.itemgroup;
 
+import beans.Item.Item;
 import beans.brand.Brand;
 import beans.data.BatchDeleteErr;
 import beans.datacontrllog.DataContrlLog;
@@ -170,7 +171,7 @@ public class itemgroup extends Controller {
         ArrayList<Long> ids = rows.toArrayList("itemid", new ArrayList<>());
 
         //默认商品图片
-        Rows defaultImageRows = getAttachmentUrl("system", (long) 1, "defaultImage");
+        Rows defaultImageRows = Item.getItemdefaultImage(this);
         //封面cover
         RowsMap coverRowsMap = getAttachmentUrl("plm_item", ids, "cover");
         //附件
@@ -218,7 +219,7 @@ public class itemgroup extends Controller {
         ArrayList<Long> ids = rows.toArrayList("itemid", new ArrayList<>());
 
         //默认商品图片
-        Rows defaultImageRows = getAttachmentUrl("system", (long) 1, "defaultImage");
+        Rows defaultImageRows = Item.getItemdefaultImage(this);
         //封面cover
         RowsMap coverRowsMap = getAttachmentUrl("plm_item", ids, "cover");
         //附件
@@ -533,7 +534,7 @@ public class itemgroup extends Controller {
         Rows rows = dbConnect.runSqlQuery(sqlFactory);
         ArrayList<Long> ids = rows.toArrayList("itemid", new ArrayList<>());
         //默认商品图片
-        Rows defaultImageRows = getAttachmentUrl("system", (long) 1, "defaultImage");
+        Rows defaultImageRows = Item.getItemdefaultImage(this);
         // 封面cover
         RowsMap coverRowsMap = getAttachmentUrl("plm_item", ids, "cover");
         // 附件

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

@@ -2,6 +2,7 @@ package restcontroller.webmanage.sale.technicalinfo;
 
 import java.util.ArrayList;
 
+import beans.Item.Item;
 import org.apache.commons.lang.StringUtils;
 
 import com.alibaba.fastjson.JSONArray;
@@ -98,7 +99,7 @@ public class technicalinfo extends Controller {
 
 		ArrayList<Long> ids = rows.toArrayList("plm_technicalinfoid", new ArrayList<>());
 		//默认商品图片
-		Rows defaultImageRows = getAttachmentUrl("system", (long) 1, "defaultImage");
+		Rows defaultImageRows = Item.getItemdefaultImage(this);
 		// 封面cover
 		RowsMap coverRowsMap = getAttachmentUrl("plm_technicalinfo", ids, "cover");
 		// 附件