TB_USER.MASKING_YN 마스킹여부 칼럼 추가에 따른 수정

style24.admin/src/main/java/com/style24/persistence/domain/User.java

@@ -23,31 +23,32 @@ public class User extends TscBaseDomain {
 
 	}
 
-	private Integer userNo;
-	private String userId;
-	private String userNm;
-	private String passwd;
-	private String roleCd;
-	private String roleNm;
-	private String roleRefVal;
-	private String supplyCompCd;
-	private String supplyCompNm;
-	private String vendorId;
-	private String vendorNm;
-	private String afLinkCd;
-	private String afLinkNm;
-	private String afChannel;
-	private String afChannelNm;
-	private String email;
-	private String cellPhnno;
-	private int pntAssignAmt;
-	private String ipAddr;
-	private String ipChkYn;
-	private String loginLdt;
-	private String passwdChgDt;
-	private String useYn;
-	private int loginFailCnt;
-	private String loginFailYn;
+	private Integer userNo;			// 사용자번호
+	private String userId;			// 사용자ID
+	private String userNm;			// 사용자명
+	private String passwd;			// 비밀번호
+	private String roleCd;			// 권한코드
+	private String roleNm;			// 권한명
+	private String roleRefVal;		// 권한관련값
+	private String supplyCompCd;	// 공급업체코드
+	private String supplyCompNm;	// 공급업체명
+	private String vendorId;		// 벤더ID
+	private String vendorNm;		// 벤더명
+	private String afLinkCd;		// 제휴링크코드
+	private String afLinkNm;		// 제휴링크명
+	private String afChannel;		// 제휴채널
+	private String afChannelNm;		// 제휴채널명
+	private String email;			// 이메일
+	private String cellPhnno;		// 휴대전화번호
+	private int pntAssignAmt;		// 포인트할당금액
+	private String ipAddr;			// IP주소
+	private String ipChkYn;			// IP체크여부
+	private String loginLdt;		// 최종로그인일시
+	private String passwdChgDt;		// 비밀번호변경일시
+	private String useYn;			// 사용여부
+	private String maskingYn;		// 마스킹여부
+	private int loginFailCnt;		// 로그인실패건수
+	private String loginFailYn;		// 로그인실패여부
 
 	// 사용자 목록 검색조건
 	private String searchGb;

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

@@ -54,6 +54,7 @@
 		     , IP_ADDR                                                     /*IP주소*/
 		     , IP_CHK_YN                                                   /*IP체크여부*/
 		     , DATE_FORMAT(PASSWD_CHG_DT,'%Y%m%d%H%i%S') AS PASSWD_CHG_DT  /*비밀번호변경일시*/
+		     , MASKING_YN                                                  /*마스킹여부*/
 		FROM   TB_USER A
 		WHERE  USER_ID = #{userId}
 		AND    NOT (ROLE_CD LIKE 'G001_B%' OR ROLE_CD LIKE 'G001_E%') /*입점업체담당자, 촬영업체담당자*/

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

@@ -33,6 +33,7 @@
 		     , DATE_FORMAT(A.LOGIN_LDT,'%Y%m%d%H%i%S')     AS LOGIN_LDT      /*최종로그인일시*/
 		     , DATE_FORMAT(A.PASSWD_CHG_DT,'%Y%m%d%H%i%S') AS PASSWD_CHG_DT  /*비밀번호변경일시*/
 		     , A.USE_YN                                                      /*사용여부*/
+		     , A.MASKING_YN                                                  /*마스킹여부*/
 		FROM   TB_USER A
 		WHERE  1 = 1
 		<choose>
@@ -76,6 +77,7 @@
 		     , DATE_FORMAT(LOGIN_LDT,'%Y-%m-%d %H:%i:%S')     AS LOGIN_LDT     /*최종로그인일시*/
 		     , DATE_FORMAT(PASSWD_CHG_DT,'%Y-%m-%d %H:%i:%S') AS PASSWD_CHG_DT /*비밀번호변경일시*/
 		     , USE_YN                                                          /*사용여부*/
+		     , MASKING_YN                                                      /*마스킹여부*/
 		FROM   TB_USER A
 		WHERE  USER_NO = #{userNo}
 	</select>
@@ -114,6 +116,7 @@
 		     , IP_ADDR
 		     , IP_CHK_YN
 		     , USE_YN
+		     , MASKING_YN
 		     , REG_NO
 		     , REG_DT
 		     , UPD_NO
@@ -132,6 +135,7 @@
 		     , #{ipAddr}
 		     , #{ipChkYn}
 		     , #{useYn}
+		     , #{maskingYn}
 		     , #{regNo}
 		     , NOW()
 		     , #{updNo}
@@ -147,6 +151,7 @@
 		     , IP_ADDR = #{ipAddr}
 		     , IP_CHK_YN = #{ipChkYn}
 		     , USE_YN = #{useYn}
+		     , MASKING_YN = #{maskingYn}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()
 	</insert>

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

@@ -97,17 +97,24 @@
 							<input type="text" name="ipAddr" placeholder="" maxlength="20" data-valid-type="ipAddress" data-valid-name="IP주소"/>
 						</td>
 					</tr>
-					
 					<tr>
 						<th>IP체크여부</th>
 						<td>
 							<input type="hidden" name="ipChkYn" value="Y"/>
-							<label class="chkBox"><input type="checkbox" name="chkIpChkYn" value="Y"/>IP체크</label>
+							<label class="chkBox checked"><input type="checkbox" name="chkIpChkYn" value="Y"/>IP체크</label>
 						</td>
 						<th>사용여부</th>
 						<td>
 							<input type="hidden" name="useYn" value="Y"/>
-							<label class="chkBox"><input type="checkbox" name="chkUseYn" value="Y" checked="checked"/>사용</label>
+							<label class="chkBox checked"><input type="checkbox" name="chkUseYn" value="Y" checked="checked"/>사용</label>
+						</td>
+					</tr>
+					<tr>
+						<th>마스킹여부</th>
+						<td colspan="3">
+							<input type="hidden" name="maskingYn" value="N"/>
+							<label class="chkBox checked"><input type="checkbox" name="chkMaskingYn" value="Y" checked="checked"/>마스킹</label>
+							<span class="infoTxt cBlue marL10"><i class="fa fa-info-circle" aria-hidden="true"></i>회원정보에 대한 마스킹 처리여부</span>
 						</td>
 					</tr>
 				</table>
@@ -207,18 +214,23 @@
 						</td>
 					</tr>
 					<tr>
+						<th>마스킹여부</th>
+						<td>
+							<input type="hidden" name="maskingYn" th:value="${userInfo.maskingYn}"/>
+							<label th:class="${'chkBox' + (userInfo.maskingYn == 'Y' ? ' checked' : '')}"><input type="checkbox" name="chkMaskingYn" th:value="${userInfo.maskingYn}" th:checked="${userInfo.maskingYn == 'Y'}"/>마스킹</label>
+						</td>
 						<th>사용여부</th>
 						<td>
 							<input type="hidden" name="useYn" th:value="${userInfo.useYn}"/>
 							<label th:class="${'chkBox' + (userInfo.useYn == 'Y' ? ' checked' : '')}"><input type="checkbox" name="chkUseYn" th:value="${userInfo.useYn}" th:checked="${userInfo.useYn == 'Y'}"/>사용</label>
 						</td>
+					</tr>
+					<tr>
 						<th>최종로그인일시</th>
 						<td th:text="*{loginLdt}">
 						</td>
-					</tr>
-					<tr>
 						<th>비밀번호변경일시</th>
-						<td colspan="3" th:text="*{passwdChgDt}">
+						<td th:text="*{passwdChgDt}">
 						</td>
 					</tr>
 				</table>
@@ -438,6 +450,7 @@
 			sureBtnText: "확인",
 			sureBtnClick: function() {
 				$(formId + ' input[name=ipChkYn]').val($(formId + ' input:checkbox[name=chkIpChkYn]').is(":checked") ? 'Y' : 'N');
+				$(formId + ' input[name=maskingYn]').val($(formId + ' input:checkbox[name=chkMaskingYn]').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,6);

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

@@ -134,6 +134,7 @@
 		{headerName: "휴대전화번호", field: "cellPhnno", width: 150, cellClass: 'text-center'},
 		{headerName: "IP주소", field: "ipAddr", width: 100, cellClass: 'text-center'},
 		{headerName: "IP체크여부", field: "ipChkYn", width: 100, cellClass: 'text-center'},
+		{headerName: "마스킹여부", field: "maskingYn", width: 100, cellClass: 'text-center'},
 		{headerName: "사용여부", field: "useYn", width: 100, cellClass: 'text-center'},
 		{
 			headerName: '최근로그인일시', field: 'loginLdt', width: 150, cellClass: 'text-center',