Merge remote-tracking branch 'origin/developerB' into developerB

src/main/resources/mappings/modules/weisha/CmOrganizePromotionMapper.xml

@@ -168,6 +168,7 @@
         <where>
             cop.delFlag = 0
             and cop.status = 1
+            and cop.organizeId = #{organizeId}
             <if test="productID != null">
                 AND cop.productId = #{productID}
             </if>

src/main/webapp/WEB-INF/views/modules/weisha/organizeSinglePromotionForm.jsp

@@ -170,7 +170,7 @@
                     var $itemProductID = $this.find('input[name="info"]').val();
                     showSelectProductID += $itemProductID + ',';
                 });
-                url = "${ctx}/weisha/cmOrganizePromotions/findProductPage?productIds=" + showSelectProductID + "&promotionType=1&delProductIds=" + delProductIds;
+                url = "${ctx}/weisha/cmOrganizePromotions/findProductPage?productIds=" + showSelectProductID + "&promotionType=1&delProductIds=" + delProductIds +"&organizeId=" + $("#organizeId").val();
                 title = "选择促销单品";
             } else {
                 $('#contentTbody1 tr').each(function (index, item) {
@@ -178,7 +178,7 @@
                     var $itemProductID = $this.find('input[name="gift"]').val();
                     showSelectProductID += $itemProductID + ',';
                 });
-                url ="${ctx}/weisha/cmOrganizePromotions/findProductPage?productIds=" + showSelectProductID
+                url ="${ctx}/weisha/cmOrganizePromotions/findProductPage?productIds=" + showSelectProductID +"&organizeId=" + $("#organizeId").val()
                 title = "选择促销赠品";
             }
             showSelectProductID = showSelectProductID.slice(0, -1)