Merge remote-tracking branch 'origin/style' into jsh77b

src/main/java/com/style24/admin/biz/web/TsaGoodsController.java

@@ -11,6 +11,8 @@ import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.ImageIcon;
 
+import com.style24.admin.biz.service.*;
+import com.style24.core.biz.service.TscExcelService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -35,11 +37,6 @@ import com.gagaframework.web.rest.server.GagaResponseStatus;
 import com.gagaframework.web.util.GagaDateUtil;
 import com.gagaframework.web.util.GagaFileUtil;
 import com.gagaframework.web.util.GagaStringUtil;
-import com.style24.admin.biz.service.TsaCommonService;
-import com.style24.admin.biz.service.TsaCustomerService;
-import com.style24.admin.biz.service.TsaGoodsService;
-import com.style24.admin.biz.service.TsaRendererService;
-import com.style24.admin.biz.service.TsaSystemService;
 import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.biz.service.TscKakaotalkService;
@@ -121,6 +118,9 @@ public class TsaGoodsController extends TsaBaseController {
 	@Autowired
 	private ObjectMapper mapper;
 
+	@Autowired
+	private TscExcelService excelService;
+
 	private static final int EXCEL_ROW_COUNT = 500;
 
 	/**
@@ -3094,7 +3094,8 @@ public class TsaGoodsController extends TsaBaseController {
 			"niContent17", "niContent18", "niContent19", "niContent20", "niContent21", "niContent22", "niContent23",
 			"niContent24", "niContent25", "niContent26", "niContent27", "niContent28"};
 
-		ecxelGoodsList = GagaExcelUtil.getList(GagaFileUtil.getConcatenationPath(targetPath, goodsMass.getExcelFileNm()), 0, goodsNames, 0);
+
+		ecxelGoodsList = excelService.getExcelList(GagaFileUtil.getConcatenationPath(targetPath, goodsMass.getExcelFileNm()), 0, goodsNames, 0);
 
 		//건수
 		if (ecxelGoodsList != null && ecxelGoodsList.size() > EXCEL_ROW_COUNT) {

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

@@ -88,6 +88,9 @@
 		<if test="useYn != null and useYn != ''">
 		AND    A.USE_YN  = #{useYn}
 		</if>
+		<if test="supplyVendorCd != null and supplyVendorCd != ''">
+		AND    A.ROLE_REF_VAL = #{supplyVendorCd}
+		</if>
 		<if test="supplyCompCd != null and supplyCompCd != ''">
 		AND    A.ROLE_REF_VAL = (SELECT SUPPLY_VENDOR_CD
 		                         FROM   TB_SUPPLY_COMPANY

src/main/webapp/WEB-INF/views/system/UserForm.html

@@ -40,16 +40,16 @@
 						<col style="width:10%;"/>
 					</colgroup>
 					<tr>
-						<th>업체</th>
+						<th>입점벤더</th>
 						<td>
 <!-- 							<select name="supplyCompCd"> -->
 <!-- 								<option th:if="${sessionInfo.supplyCompCd == null}" value="">[전체]</option> -->
 <!-- 								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option> -->
 <!-- 							</select> -->
-							<input type="text" class="w100" name="supplyCompSearchTxt" id="supplyCompSearchTxt" maxlength="20"/>
-							<button type="button" class="btn icn" onclick="cfnOpenCompanyListPopup('fnSetSupplyCompInfo', 'M');"><i class="fa fa-search"></i></button>
-							<span id="supplyCompTxt"></span>
-							<input type="hidden" name="supplyCompList"/>
+							<input type="text" class="w100" name="supplyVendorCd" id="supplyCompSearchTxt" maxlength="20"/>
+							<button type="button" class="btn icn" onclick="fnOpenSupplyVendorPopup('input[name=supplyVendorCd]', 'M');"><i class="fa fa-search"></i></button>
+<!--							<span id="supplyCompTxt"></span>-->
+<!--							<input type="hidden" name="supplyCompList"/>-->
 						</td>
 						<th>권한</th>
 						<td>
@@ -254,6 +254,14 @@
 		var actionUrl = "/system/user/menu/" + userNo;
 		cfnOpenModalPopup(actionUrl, "popupUserMenu");
 	}
+
+	// 공급벤더 팝업
+	var fnOpenSupplyVendorPopup = function(strReturnCode, strReturnName) {
+		var oParam = new Object();
+		oParam.returnCode = strReturnCode;
+		oParam.returnName = strReturnName;
+		cfnOpenSupplyVendorPopup($(strReturnName).val(), oParam);
+	}
 	
 	$(document).ready(function() {
 		// Create a agGrid

src/main/webapp/ux/plugins/gaga/gaga.validation.js

@@ -618,7 +618,7 @@ var gagajf = {
 					}
 				} else { // 실패
 					if (!gagajf.isNull(result.error.message)) {
-						mcxDialog.alert(result.error.message);
+						mcxDialog.alert(result.error.message.replaceAll("&lt;", "<").replaceAll("&gt;", ">"));
 					}
 
 					return;
@@ -695,7 +695,7 @@ var gagajf = {
 					}
 				} else { // 실패
 					if (!gagajf.isNull(result.error.message)) {
-						mcxDialog.alert(result.error.message);
+						mcxDialog.alert(result.error.message.replaceAll("&lt;", "<").replaceAll("&gt;", ">"));
 					}
 
 					return;