Merge branch 'develop' into develop-green

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

@@ -556,7 +556,7 @@ public class promotion extends Controller {
                     return getErrReturnObject().setErrMsg("返利促销授权的经销商必须都为限购").toString();
                 }
             }
-            if(!rows.get(0).getBoolean("authmethod") && dbConnect.runSqlQuery("select * from sa_promotion_auth where siteid='" + siteid + "' and sa_promotionid=" + sa_promotionid).isEmpty()){
+            if(rows.get(0).getBoolean("authmethod") && dbConnect.runSqlQuery("select * from sa_promotion_auth where siteid='" + siteid + "' and sa_promotionid=" + sa_promotionid).isEmpty()){
                 return getErrReturnObject().setErrMsg("请添加范围内非授权经销商名单！").toString();
             }
             for (Row row:rowsdetails) {