gagamel 5 лет назад
Родитель
Сommit
fbd619fcb5

+ 1 - 1
src/main/java/com/style24/admin/biz/web/TsaGoodsController.java

@@ -2421,7 +2421,7 @@ public class TsaGoodsController extends TsaBaseController {
 	@ResponseBody
 	public Collection<GoodsNotiInfo> getGoodsNotiInfoListByNotiClsf(@RequestBody GoodsNotiInfo goodsNotiInfo) {
 		// multi row 검색관련 처리
-		if (!StringUtils.isBlank(goodsNotiInfo.getGoodsCd())) {
+		if (StringUtils.isNotBlank(goodsNotiInfo.getGoodsCd())) {
 			goodsNotiInfo.setGoodsCds(goodsNotiInfo.getGoodsCd().replaceAll("\r", "").split("\n"));
 		}
 

+ 1 - 1
src/main/java/com/style24/persistence/mybatis/shop/TsaGoods.xml

@@ -3804,7 +3804,7 @@
 		             , RANK() OVER(PARTITION BY GOODS_CD ORDER BY NI_ITEM_CD) AS RK /*정렬순서 중요함. 변경하지 마세요.*/
 		        FROM   TB_GOODS_NOTI_INFO
 		        WHERE  NI_CLSF_CD = #{niClsfCd}
-		        <if test="goodsCds != '' and goodsCds != ''">
+		        <if test="goodsCds != null and goodsCds != ''">
 		        AND    (
 		                <foreach collection="goodsCds" item="item" index="index" separator="or">
 		                UPPER(GOODS_CD) LIKE CONCAT('%',UPPER(#{item}),'%') 

+ 9 - 5
src/main/webapp/WEB-INF/views/system/UserDetailForm.html

@@ -176,20 +176,24 @@
 								<option th:if="${roleList}" th:each="oneData, status : ${roleList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}" th:selected="${roleCd == oneData.cd}"></option>
 							</select>
 						</td>
-						<th><span id="detailRoleRefVal">업체</span></th>
+						<th>
+							<span id="detailRoleRefVal" th:if="${userInfo.roleCd == 'G001_B000'}">업체</span>
+							<span id="detailRoleRefVal" th:if="${userInfo.roleCd == 'G001_C000'}">외부몰벤더</span>
+							<span id="detailRoleRefVal" th:if="${userInfo.roleCd == 'G001_D000'}">제휴채널</span>
+						</th>
 						<td>
 							<input type="hidden" name="roleRefVal" th:value="${userInfo.roleRefVal}"/>
-							<select name="supplyCompCd">
+							<select name="supplyCompCd" th:style="${userInfo.roleCd == 'G001_B000' ? '' : 'display: none'}">
 								<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}" th:selected="${userInfo.roleRefVal == oneData.cd}"></option>
 							</select>
-							<select name="vendorId" style="display: none">
+							<select name="vendorId" th:style="${userInfo.roleCd == 'G001_C000' ? '' : 'display: none'}">
 								<option th:if="${sessionInfo.vendorId == null}" value="">[선택]</option>
 								<option th:if="${vendorList}" th:each="oneData, status : ${vendorList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}" th:selected="${userInfo.roleRefVal == oneData.cd}"></option>
 							</select>
-							<select name="afLinkCd" style="display: none">
+							<select name="afLinkCd" th:style="${userInfo.roleCd == 'G001_D000' ? '' : 'display: none'}">
 								<option th:if="${sessionInfo.afLinkCd == null}" value="">[선택]</option>
-								<option th:if="${afLinkList}" th:each="oneData, status : ${afLinkList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+								<option th:if="${afLinkList}" th:each="oneData, status : ${afLinkList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}" th:selected="${userInfo.roleRefVal == oneData.cd}"></option>
 							</select>
 						</td>
 					</tr>