Merge remote-tracking branch 'origin/develop_blue' into develop_green

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

@@ -1275,7 +1275,7 @@ public class databoard extends Controller {
         Rows arearows = dbConnect.runSqlQuery(areasqlFactory);
 
 
-        if(arearows.isNotEmpty()){
+        if(arearows.isNotEmpty() && arearows.size()>1){
             ArrayList<Long> arrayList =arearows.toArrayList("sa_saleareaid", new ArrayList<Long>());
             arrayList.addAll(SaleArea.getSubSaleAreaIds(this, arrayList));
             String sql ="";
@@ -1299,7 +1299,7 @@ public class databoard extends Controller {
         Rows arearows = dbConnect.runSqlQuery(areasqlFactory);
 
 
-        if(arearows.isNotEmpty()){
+        if(arearows.isNotEmpty() && arearows.size()>1){
             ArrayList<Long> arrayList =arearows.toArrayList("sa_saleareaid", new ArrayList<Long>());
             arrayList.addAll(SaleArea.getSubSaleAreaIds(this, arrayList));
             String sql ="";

src/custom/restcontroller/webmanage/sale/order/SQL/促销方案商品列表.sql

@@ -16,6 +16,7 @@ SELECT t1.itemid,
        t3.groupqty,
        t3.saledqty,
        t1.spec,
+       t1.standards,
        t1.marketprice,
        (SELECT unitname FROM plm_unit WHERE unitid = t1.unitid and siteid = t1.siteid)    unit,
        (SELECT unitname FROM plm_unit WHERE unitid = t2.auxunitid and siteid = t1.siteid) auxunit,