Merge branch 'ST24PRJ-335' into develop

src/main/java/com/style24/persistence/mybatis/shop/TsaStatistics.xml

@@ -226,15 +226,12 @@
 		                       OR FRONT_GB = 'A'
 		               </if>
 		                      )
-		               <if test='mallGb != null and mallGb != ""'>
-		               AND    IFNULL(EXTMALL_ID,'') != '' /*제휴몰만*/
-		                   <if test='multiExtmallId != null and multiExtmallId != ""'>
+	                   <if test='multiExtmallId != null and multiExtmallId != ""'>
 		               AND    EXTMALL_ID IN
-		                       <foreach collection="multiExtmallId" item="item" index="index"  open="(" close=")" separator=",">
-		                       #{item}
-		                       </foreach>
-		                   </if>
-		               </if>
+	                       <foreach collection="multiExtmallId" item="item" index="index"  open="(" close=")" separator=",">
+	                       #{item}
+	                       </foreach>
+	                   </if>
 		               AND    (
 		                       1 = 1
 		               <if test='distributionGbWms != null and distributionGbWms != ""'>
@@ -303,14 +300,11 @@
 		        OR SOD.FRONT_GB = 'A'
 		</if>
 		       )
-		<if test='mallGb != null and mallGb != ""'>
-		AND    IFNULL(SOD.EXTMALL_ID,'') != '' /*제휴몰만*/
-		    <if test='multiExtmallId != null and multiExtmallId != ""'>
+		<if test='multiExtmallId != null and multiExtmallId != ""'>
 		AND    SOD.EXTMALL_ID IN
-		        <foreach collection="multiExtmallId" item="item" index="index"  open="(" close=")" separator=",">
-		        #{item}
-		        </foreach>
-		    </if>
+	        <foreach collection="multiExtmallId" item="item" index="index"  open="(" close=")" separator=",">
+	        #{item}
+	        </foreach>
 		</if>
 		AND    (
 		        1 = 1

src/main/webapp/WEB-INF/views/statistics/DailyOrderForm.html

@@ -91,7 +91,7 @@
 							<input type="text" class="w100" name="itemkindCdSearchTxt" id="itemkindCdSearchTxt" maxlength="20" />
 							<button type="button" class="btn icn" onclick="cfnOpenItemkindListPopup('fnSetItemkindInfo', 'M');"><i class="fa fa-search"></i></button>
 							<span id="itemkindCdTxt"></span>
-							<input type="hidden" name="itemkindList"/>
+							<input type="hidden" name="itemkindCdList"/>
 						</td>
 					</tr>
 				</table>