브랜드관리 - md 조회 / 등록 관련 수정

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

@@ -258,7 +258,7 @@ public class TsaBusinessController extends TsaBaseController {
 	 * @author gagamel
 	 * @since 2020. 11. 4
 	 */
-	@PostMapping("/brand/md/list/save")
+	@PostMapping("/brand/md/save")
 	@ResponseBody
 	public GagaResponse saveBrandMdList(@RequestBody Collection<BrandMd> brandMdList) {
 		if (brandMdList == null || brandMdList.isEmpty()) {

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaBusiness.xml

@@ -377,7 +377,8 @@
 		SELECT USER_NO AS MD_NO
 		     , USER_NM AS MD_NM
 		FROM   TB_USER
-		WHERE  ROLE_CD = 'G001_A101' /*MD권한*/
+		WHERE   1 = 1
+		/* AND ROLE_CD = 'G001_A101'  */  /*MD권한*/
 		<if test="mdNm != null and mdNm != ''">
 		AND    LOWER(USER_NM) LIKE CONCAT('%',LOWER(#{mdNm}),'%')
 		</if>

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaLogin.xml

@@ -12,37 +12,37 @@
 		     , ROLE_CD                                                     /*권한코드*/
 		     , FN_GET_CODE_NM('G001',ROLE_CD)            AS ROLE_NM        /*권한명*/
 		     , ROLE_REF_VAL                                                /*권한관련값*/
-		     , CASE WHEN SUBSTR(ROLE_CD,1,1) IN ('A','B','E') THEN
+		     , CASE WHEN SUBSTR(REPLACE(ROLE_CD,'G001_', ''),1,1) IN ('A','B','E') THEN
 		                ROLE_REF_VAL
 		            END                                  AS SUPPLY_COMP_CD /*공급업체코드
-		     , CASE WHEN SUBSTRING(ROLE_CD,1,1) IN ('A','B','E') THEN
+		     , CASE WHEN SUBSTRING(REPLACE(ROLE_CD,'G001_', ''),1,1) IN ('A','B','E') THEN
 		                (SELECT SUPPLY_COMP_NM
 		                 FROM   TB_SUPPLY_COMPANY
 		                 WHERE  SUPPLY_COMP_CD = A.ROLE_REF_VAL
 		                )
 		       END                                       AS SUPPLY_COMP_NM /*공급업체명*/
-		     , CASE WHEN SUBSTRING(ROLE_CD,1,1) = 'C' THEN
+		     , CASE WHEN SUBSTRING(REPLACE(ROLE_CD,'G001_', ''),1,1) = 'C' THEN
 		                ROLE_REF_VAL
 		       END                                       AS VENDOR_ID      /*벤더ID*/
-		     , CASE WHEN SUBSTRING(ROLE_CD,1,1) = 'C' THEN
+		     , CASE WHEN SUBSTRING(REPLACE(ROLE_CD,'G001_', ''),1,1) = 'C' THEN
 		                FN_GET_CODE_NM('G003',ROLE_REF_VAL)
 		       END                                       AS VENDOR_NM      /*벤더명*/
-		     , CASE WHEN SUBSTRING(ROLE_CD,1,1) = 'D' THEN
+		     , CASE WHEN SUBSTRING(REPLACE(ROLE_CD,'G001_', ''),1,1) = 'D' THEN
 		                ROLE_REF_VAL
 		       END                                       AS AF_LINK_CD     /*제휴링크코드*/
-		     , CASE WHEN SUBSTRING(ROLE_CD,1,1) = 'D' THEN
+		     , CASE WHEN SUBSTRING(REPLACE(ROLE_CD,'G001_', ''),1,1) = 'D' THEN
 		                (SELECT AF_LINK_NM
 		                 FROM   TB_AF_LINK
 		                 WHERE  AF_LINK_CD = A.ROLE_REF_VAL
 		                )
 		       END                                       AS AF_LINK_NM     /*제휴링크명*/
-		     , CASE WHEN SUBSTRING(ROLE_CD,1,1) = 'D' THEN
+		     , CASE WHEN SUBSTRING(REPLACE(ROLE_CD,'G001_', ''),1,1) = 'D' THEN
 		                (SELECT AF_CHANNEL
 		                 FROM   TB_AF_LINK
 		                 WHERE  AF_LINK_CD = A.ROLE_REF_VAL
 		                )
 		       END                                       AS AF_CHANNEL     /*제휴채널*/
-		     , CASE WHEN SUBSTRING(ROLE_CD,1,1) = 'D' THEN
+		     , CASE WHEN SUBSTRING(REPLACE(ROLE_CD,'G001_', ''),1,1) = 'D' THEN
 		                (SELECT FN_GET_CODE_NM('G053',AL.AF_CHANNEL)
 		                 FROM   TB_AF_LINK AL
 		                 WHERE  AL.AF_LINK_CD = A.ROLE_REF_VAL
@@ -56,6 +56,7 @@
 		     , DATE_FORMAT(PASSWD_CHG_DT,'%Y%m%d%H%i%S') AS PASSWD_CHG_DT  /*비밀번호변경일시*/
 		FROM   TB_USER A
 		WHERE  USER_ID = #{userId}
+		AND    NOT (ROLE_CD LIKE 'G001_B%' OR ROLE_CD LIKE 'G001_E%') /*입점업체담당자, 촬영업체담당자*/
 		AND    USE_YN = 'Y'
 	</select>
 	

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

@@ -10,19 +10,19 @@
 		     , A.USER_NM                                                     /*사용자명*/
 		     , A.ROLE_CD                                                     /*권한코드*/
 		     , A.ROLE_REF_VAL                                                /*권한관련값*/
-		     , CASE WHEN SUBSTRING(A.ROLE_CD,1,1) IN ('A','B','E') THEN
+		     , CASE WHEN SUBSTRING(REPLACE(A.ROLE_CD,'G001_', ''),1,1) IN ('A','B','E') THEN
 		                A.ROLE_REF_VAL
 		            END                                    AS SUPPLY_COMP_CD /*공급업체코드*/
-		     , CASE WHEN SUBSTRING(A.ROLE_CD,1,1) IN ('A','B','E') THEN
+		     , CASE WHEN SUBSTRING(REPLACE(A.ROLE_CD,'G001_', ''),1,1) IN ('A','B','E') THEN
 		                (SELECT SUPPLY_COMP_NM
 		                 FROM   TB_SUPPLY_COMPANY
 		                 WHERE  SUPPLY_COMP_CD = A.ROLE_REF_VAL
 		                )
 		       END                                         AS SUPPLY_COMP_NM /*공급업체명*/
-		     , CASE WHEN SUBSTRING(A.ROLE_CD,1,1) = 'C' THEN
+		     , CASE WHEN SUBSTRING(REPLACE(A.ROLE_CD,'G001_', ''),1,1) = 'C' THEN
 		                A.ROLE_REF_VAL
 		       END                                         AS VENDOR_ID      /*벤더ID*/
-		     , CASE WHEN SUBSTRING(A.ROLE_CD,1,1) = 'C' THEN
+		     , CASE WHEN SUBSTRING(REPLACE(A.ROLE_CD,'G001_', ''),1,1) = 'C' THEN
 		                FN_GET_CODE_NM('G003',A.ROLE_REF_VAL)
 		       END                                         AS VENDOR_NM      /*벤더명*/
 		     , A.EMAIL                                                       /*이메일*/

style24.admin/src/main/webapp/WEB-INF/views/business/BrandForm.html

@@ -431,9 +431,9 @@
 	
 	
 	// 브랜드담당MD 목록
-	var fnGetBrandMdList = function(brandCd) {
+	var fnGetBrandMdList = function(brandCd) {debugger;
 		$.getJSON('/business/brand/md/list/' + brandCd
-			, function(result, status) {
+			, function(result, status) {debugger;
 				$("#tdBrandMd input[name=mdNm]").val('');
 				$("#tdBrandMd input[name=mdNo]").val('');
 				
@@ -444,7 +444,7 @@
 				});
 				
 				for (var i = 0; i < result.length; i++) {
-					if (result[i].formalGb == '10') {
+					if (result[i].formalGb == 'G009_10') {
 						if (i == 0) {
 							$("#brandMdArea input[name=mdNm]").val(result[i].mdNm);
 							$("#brandMdArea input[name=mdNo]").val(result[i].mdNo);
@@ -484,10 +484,10 @@
 		});
 	}
 	
-	var fnSetMdInfo = function(result) {
+	var fnSetMdInfo = function(result) {debugger;
 		var ind = $('#mdIdx').val();
-		$("#tdBrandMd input[name=mdNo]").eq(ind).val(result.userNo);
-		$("#tdBrandMd input[name=mdNm]").eq(ind).val(result.userNm);
+		$("#tdBrandMd input[name=mdNo]").eq(ind).val(result[0].mdNo);
+		$("#tdBrandMd input[name=mdNm]").eq(ind).val(result[0].mdNm);
 	}
 	
 	// 브랜드담당MD 수정

style24.admin/src/main/webapp/WEB-INF/views/system/UserDetailForm.html

@@ -272,12 +272,12 @@
 	
 	// 등록화면 권한 변경 시
 	$('#userRegisterForm select[name=roleCd]').on('change', function() {
-		var abRoleCd = $(this).val().substring(0,1);
-		if (abRoleCd == 'A' || abRoleCd == 'B') { // 입점업체
+		var abRoleCd = $(this).val().substring(0,6);
+		if (abRoleCd == 'G001_A' || abRoleCd == 'G001_B') { // 입점업체
 			$('#userRegisterForm select[name=supplyCompCd]').show();
 			$('#userRegisterForm select[name=vendorId]').hide();
 			$('#registerRoleRefVal').text('업체');
-		} else if (abRoleCd == 'C') { // 외부몰벤더
+		} else if (abRoleCd == 'G001_C') { // 외부몰벤더
 			$('#userRegisterForm select[name=supplyCompCd]').hide();
 			$('#userRegisterForm select[name=vendorId]').show();
 			$('#registerRoleRefVal').text('외부몰벤더');
@@ -371,12 +371,12 @@
 			$('#userDetailForm input[name=roleChangeYn]').val('Y');
 		}
 		
-		var abRoleCd = $(this).val().substring(0,1);
-		if (abRoleCd == 'A' || abRoleCd == 'B') { // 입점업체
+		var abRoleCd = $(this).val().substring(0,6);
+		if (abRoleCd == 'G001_A' || abRoleCd == 'G001_B') { // 입점업체
 			$('#userDetailForm select[name=supplyCompCd]').show();
 			$('#userDetailForm select[name=vendorId]').hide();
 			$('#detailRoleRefVal').text('업체');
-		} else if (abRoleCd == 'C') { // 외부몰벤더
+		} else if (abRoleCd == 'G001_C') { // 외부몰벤더
 			$('#userDetailForm select[name=supplyCompCd]').hide();
 			$('#userDetailForm select[name=vendorId]').show();
 			$('#detailRoleRefVal').text('외부몰벤더');
@@ -439,11 +439,11 @@
 			sureBtnClick: function() {
 				$(formId + ' input[name=ipChkYn]').val($(formId + ' input:checkbox[name=chkIpChkYn]').is(":checked") ? 'Y' : 'N');
 				$(formId + ' input[name=useYn]').val($(formId + ' input:checkbox[name=chkUseYn]').is(":checked") ? 'Y' : 'N');
-				
-				var abRoleCd = $(formId + ' select[name=roleCd]').val().substring(0,1);
-				if (abRoleCd == 'A' || abRoleCd == 'B' || abRoleCd == 'E') { // 자사,입점,촬영업체
+				debugger;
+				var abRoleCd = $(formId + ' select[name=roleCd]').val().substring(0,6);
+				if (abRoleCd == 'G001_A' || abRoleCd == 'G001_B' || abRoleCd == 'G001_E') { // 자사,입점,촬영업체
 					$(formId + ' input[name=roleRefVal]').val($(formId + ' select[name=supplyCompCd]').val());
-				} else if (abRoleCd == 'C') { // 외부몰벤더
+				} else if (abRoleCd == 'G001_C') { // 외부몰벤더
 					$(formId + ' input[name=roleRefVal]').val($(formId + ' select[name=vendorId]').val());
 				} else {
 					$(formId + ' input[name=roleRefVal]').val('');