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

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

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

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

@@ -45,9 +45,10 @@
     <form:hidden path="promotionType"/>
     <form:hidden path="ids"/>
     <form:hidden path="delProductIds"/>
+    <form:hidden path="organizeId"/>
     <div class="ul-form">
         <label>商品ID：</label>
-        <form:input path="productID" id="productID" htmlEscape="false" maxlength="8" class="input-mini" onkeyup="onlynum(this)"/>
+        <form:input path="id" id="id" htmlEscape="false" maxlength="8" class="input-mini" onkeyup="onlynum(this)"/>
         <label>商品名称：</label>
         <form:input path="name" htmlEscape="false" class="input-medium" maxlength="20"/>
         <label>供应商名称：</label>