삭제 -> 사용안함으로 명칭 변경. 비밀번호변경 시 비밀번호변경일시 업데이트 되게 수정, 양의정수만 입력되게 추가

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

@@ -127,7 +127,7 @@ public class TsaSystemController extends TsaBaseController {
 
 		systemService.deleteUserList(userList);
 
-		return super.ok(message.getMessage("SUCC_0003"));
+		return super.ok(message.getMessage("SUCC_0004"));
 	}
 
 	/**
@@ -255,7 +255,7 @@ public class TsaSystemController extends TsaBaseController {
 	@ResponseBody
 	public GagaResponse saveUserMenuList(@RequestBody Collection<UserMenu> menuList) {
 		systemService.saveUserMenuList(menuList);
-		return super.ok(message.getMessage("SUCC_0001"));
+		return super.ok(message.getMessage("SUCC_0004"));
 	}
 
 	/**

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

@@ -196,6 +196,7 @@
 		/* TsaSystem.updateUserPassword */
 		UPDATE TB_USER
 		SET    PASSWD = #{passwd}
+		     , PASSWD_CHG_DT = NOW()
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()
 		WHERE  USER_NO = #{userNo}

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

@@ -68,7 +68,7 @@
 						<!-- 버튼 배치 영역 -->
 						<ul class="panelBar">
 							<li class="right">
-								<button type="button" class="btn btn-danger btn-lg btnDelete">삭제</button>
+								<button type="button" class="btn btn-danger btn-lg btnDelete">사용안함</button>
 							</li>
 						</ul>
 						<!-- //버튼 배치 영역 -->
@@ -475,11 +475,11 @@
 		var removedData = gagaAgGrid.removeRowData(gridOptions);
 		
 		if (removedData.length == 0) {
-			alert('선택된 행이 없습니다.');
+			mcxDialog.alert('선택된 행이 없습니다.');
 			return;
 		}
 		
-		mcxDialog.confirm("정말 삭제하시겠습니까?", {
+		mcxDialog.confirm("사용안함으로 처리하시겠습니까?", {
 			cancelBtnText: "취소",
 			sureBtnText: "확인",
 			sureBtnClick: function() {

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

@@ -94,7 +94,7 @@
 					<tr>
 						<th>포인트부여가능금액</th>
 						<td>
-							<input type="text" name="pntAssignAmt" class="aR" placeholder="" maxlength="6" data-valid-type="integer" data-valid-name="포인트부여가능금액"/>
+							<input type="text" name="pntAssignAmt" class="aR" placeholder="" maxlength="6" data-valid-type="pinteger" data-valid-name="포인트부여가능금액"/>
 						</td>
 						<th>IP주소</th>
 						<td>
@@ -180,6 +180,7 @@
 							<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>
+							<span id="detailRoleRefVal" th:if="${userInfo.roleCd != 'G001_B000' and userInfo.roleCd != 'G001_C000' and userInfo.roleCd != 'G001_D000'}"></span>
 						</th>
 						<td>
 							<input type="hidden" name="roleRefVal" th:value="${userInfo.roleRefVal}"/>
@@ -211,7 +212,7 @@
 						</td>
 						<th>포인트부여가능금액</th>
 						<td>
-							<input type="text" class="aR" name="pntAssignAmt" placeholder="" maxlength="6" data-valid-type="integer" data-valid-name="포인트부여가능금액" th:field="*{pntAssignAmt}"/>
+							<input type="text" class="aR" name="pntAssignAmt" placeholder="" maxlength="6" data-valid-type="pinteger" data-valid-name="포인트부여가능금액" th:field="*{pntAssignAmt}"/>
 						</td>
 					</tr>
 					<tr>
@@ -461,6 +462,39 @@
 			}
 		}
 		
+		var abRoleCd = $(formId + ' select[name=roleCd]').val().substring(0,6);
+		if (abRoleCd == 'G001_B') { // 입점업체
+			if (gagajf.isNull($(formId + ' select[name=supplyCompCd]').val())) {
+				mcxDialog.alertC('업체를 선택해 주세요.', {
+					sureBtnText: "확인",
+					sureBtnClick: function() {
+						$(formId + ' select[name=supplyCompCd]').focus();
+					}
+				});
+				return;
+			}
+		} else if (abRoleCd == 'G001_C') { // 외부몰벤더
+			if (gagajf.isNull($(formId + ' select[name=vendorId]').val())) {
+				mcxDialog.alertC('외부몰벤더를 선택해 주세요.', {
+					sureBtnText: "확인",
+					sureBtnClick: function() {
+						$(formId + ' select[name=vendorId]').focus();
+					}
+				});
+				return;
+			}
+		} else if (abRoleCd == 'G001_D') { // 제휴채널
+			if (gagajf.isNull($(formId + ' select[name=afLinkCd]').val())) {
+				mcxDialog.alertC('제휴채널을 선택해 주세요.', {
+					sureBtnText: "확인",
+					sureBtnClick: function() {
+						$(formId + ' select[name=afLinkCd]').focus();
+					}
+				});
+				return;
+			}
+		}
+		
 		if ($(formId + ' input:checkbox[name=chkIpChkYn]').is(":checked")) {
 			if (gagajf.isNull($(formId + ' input[name=ipAddr]').val())) {
 				mcxDialog.alertC('IP주소를 입력해 주세요.', {
@@ -481,7 +515,6 @@
 				$(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);
 				if (abRoleCd == 'G001_A' || abRoleCd == 'G001_B' || abRoleCd == 'G001_E') { // 자사,입점,촬영업체
 					$(formId + ' input[name=roleRefVal]').val($(formId + ' select[name=supplyCompCd]').val());
 				} else if (abRoleCd == 'G001_C') { // 외부몰벤더

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

@@ -94,7 +94,7 @@
 			<ul class="panelBar">
 				<li class="right">
 					<button type="button" class="btn btn-info btn-lg" onclick="fnOpenUserDetailPopup('N');">등록</button>
-					<button type="button" class="btn btn-danger btn-lg" id="btnDelete">삭제</button>
+					<button type="button" class="btn btn-danger btn-lg" id="btnDelete">사용안함</button>
 				</li>
 			</ul>
 			<!-- //버튼 배치 영역 -->
@@ -146,6 +146,12 @@
 		{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: 'passwdChgDt', width: 150, cellClass: 'text-center',
+			cellRenderer: function(params) {
+				return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD HH:mm:ss") : '';
+			}
+		},
 		{
 			headerName: '최근로그인일시', field: 'loginLdt', width: 150, cellClass: 'text-center',
 			cellRenderer: function(params) {
@@ -213,7 +219,7 @@
 			return;
 		}
 		
-		mcxDialog.confirm("정말 삭제하시겠습니까?", {
+		mcxDialog.confirm("사용안함으로 처리하시겠습니까?", {
 			cancelBtnText: "취소",
 			sureBtnText: "확인",
 			sureBtnClick: function() {