egovframe-template-simple-react-contribution/src/components/commonCode/CheckBox.jsx

@@ -11,13 +11,13 @@ function CheckBox({name, grpCd, selectedValue}){
     }, []);
 
     useEffect(() => {
-        if(checkBox&&selectedValue){
+        if(selectedValue){
             const itemCdAry = selectedValue.split(',');
             itemCdAry.forEach(function(itemCd){
                 document.querySelector(`#chkBox_${itemCd}`).checked = true;
             })
         }
-    }, [checkBox]);
+    }, [selectedValue]);
 
     function getCodeItemList() {
         EgovNet.requestFetch(

egovframe-template-simple-react-contribution/src/components/commonCode/SelectOption.jsx

@@ -10,7 +10,6 @@ function SelectOption({name, grpCd, selectedValue}){
     useEffect(() => {
         getCodeItemList()
     }, []);
-
     useEffect(() => {
         setValue(selectedValue)
     }, [selectedValue]);

egovframe-template-simple-react-contribution/src/pages/admin/users/List.jsx

@@ -20,6 +20,7 @@ function List({}) {
     });
 
     const [listTag, setListTag] = useState([]);
+    const [userSeOption, setUserSeOption] = useState([]);
 
     const [paginationInfo, setPaginationInfo] = useState({});
 
@@ -39,24 +40,32 @@ function List({}) {
             (resp) => {
                 setPaginationInfo(resp.result.paginationInfo);
                 let mutListTag = [];
+                let userSeTag = [];
 
                 setListTag([]);
+                setUserSeOption([]);
                 // 리스트 항목 구성
                 resp.result.userList.forEach(function (item, index) {
                     mutListTag.push(
                         <div className={"list_item"} key={"userListDiv_"+index}>
-                            <div><a href={"#"} onClick={()=>{userInfoModal(item)}}>{item.userId}</a></div>
+                            <div>{item.userSe}</div>
+                            <div><a href={"#"} onClick={()=>{userInfoModal(item.userSeq)}}>{item.userId}</a></div>
                             <div>{item.userNm}</div>
                             <div>{item.email}</div>
                             <div>{item.phoneNum}</div>
-                            <div>{item.statusValue}</div>
+                            <div>{item.status}</div>
                             <div><button className={"btn btn_red_h31 px-1"} onClick={()=>{removeUserInfo(item.userSeq)}}>삭제</button></div>
                         </div>
                     );
                 });
                 if(!mutListTag.length) mutListTag.push(<p className="no_data" key="0">검색된 결과가 없습니다.</p>); // 게시판 목록 초기값
 
+                resp.result.userSeOption.forEach(function (item, index){
+                    userSeTag.push(<option value={item.itemCd}>{item.itemNm}</option>)
+                })
+
                 setListTag(mutListTag);
+                setUserSeOption(userSeTag);
             },
             function (resp) {
                 console.log("err response : ", resp);
@@ -76,9 +85,9 @@ function List({}) {
         setSearchCondition({...searchCondition, pageIndex: passedPage})
     });
 
-    function userInfoModal(userInfo){
+    function userInfoModal(userSeq){
         handleShow()
-        setModalBody(<UserInfoModal savedInfo={userInfo} reloadFunction={retrieveList}></UserInfoModal>)
+        setModalBody(<UserInfoModal userSeq={userSeq} reloadFunction={retrieveList}></UserInfoModal>)
     }
     
     const removeUserInfo = useCallback((seq)=>{
@@ -128,6 +137,16 @@ function List({}) {
                         {/* <!-- 검색조건 --> */}
                         <div className="condition">
                             <ul>
+                                <li className="third_1 L">
+                                    <label className="f_select" htmlFor="sel1">
+
+                                        <select id="sel1" title="구분" defaultValue={searchCondition.userSe}
+                                                onChange={(e) => {setSearchCondition({...searchCondition, userSe: e.target.value})}}>
+                                            <option value="">전체</option>
+                                            {userSeOption}
+                                        </select>
+                                    </label>
+                                </li>
                                 <li className="third_1 L">
                                     <label className="f_select" htmlFor="sel1">
                                         <select id="sel1" title="조건" defaultValue={searchCondition.searchCondition}
@@ -151,6 +170,7 @@ function List({}) {
 
                         <div className="board_list userList">
                             <div className="head">
+                                <span>구분</span>
                                 <span>아이디</span>
                                 <span>이름</span>
                                 <span>이메일</span>

egovframe-template-simple-react-contribution/src/pages/admin/users/UserInfoModal.jsx

@@ -9,7 +9,37 @@ import SelectOption from "components/commonCode/SelectOption";
 import CheckBox from "components/commonCode/CheckBox";
 import CODE from "../../../constants/code";
 
-function UserInfoModal({savedInfo, reloadFunction}){
+function UserInfoModal({userSeq, reloadFunction}){
+
+    const [userInfo, setUserInfo] = useState({ userSeq: '', userId: '', password: '', passwordChk: '', userNm: '', email: '', phoneNum: '', userSe:'', userRole:'', status:''});
+
+    function getModalContent(){
+        EgovNet.requestFetch(
+            '/admin/users/info?userSeq='+userSeq,
+            {
+                method: "GET"
+            },
+            (resp) => {
+                const respInfo = resp.result.userInfo;
+                const info = {
+                    userSeq: respInfo.userSeq,
+                    userId: respInfo.userId,
+                    userNm: respInfo.userNm,
+                    email: respInfo.email,
+                    phoneNum: respInfo.phoneNum,
+                    password: "",
+                    passwordChk: "",
+                    userSe: respInfo.userSe,
+                    userRole: respInfo.userRole,
+                    status: respInfo.status
+                }
+                setUserInfo(info);
+            },
+            (resp) => {
+                console.log("err response : ", resp);
+            }
+        );
+    }
 
     function userInfoChange(e){
         e.preventDefault();
@@ -23,6 +53,7 @@ function UserInfoModal({savedInfo, reloadFunction}){
             userNm: form.userNm.value,
             email: form.email.value,
             phoneNum: form.phoneNum.value,
+            userSe: form.userSe.value,
             userRole: '',
             status: form.status.value,
         }
@@ -57,22 +88,26 @@ function UserInfoModal({savedInfo, reloadFunction}){
         )
     }
 
+    useEffect(() => {
+        getModalContent();
+    }, []);
+
     return (
         <>
             <Modal.Header closeButton>
                 <Modal.Title>
-                    {savedInfo?.userNm} 상세정보
+                    {userInfo.userNm} 상세정보
                 </Modal.Title>
             </Modal.Header>
             <Modal.Body>
                 <Form onSubmit={(e) =>{userInfoChange(e)}} noValidate>
-                    <input type={"hidden"} name={"userSeq"} defaultValue={savedInfo?.userSeq} />
+                    <input type={"hidden"} name={"userSeq"} defaultValue={userInfo.userSeq} />
                     <Form.Group as={Row} className="mb-3">
                         <Form.Label column sm={3}>
                             아이디
                         </Form.Label>
                         <Col sm={9}>
-                            <Form.Control type="text" name="userId" placeholder="아이디" required defaultValue={savedInfo?.userId} readOnly/>
+                            <Form.Control type="text" name="userId" placeholder="아이디" required defaultValue={userInfo?.userId} readOnly/>
                         </Col>
                     </Form.Group>
                     <Form.Group as={Row} className="mb-3">
@@ -96,7 +131,7 @@ function UserInfoModal({savedInfo, reloadFunction}){
                             이름
                         </Form.Label>
                         <Col sm={9}>
-                            <Form.Control type="text" name="userNm" placeholder="이름" required defaultValue={savedInfo?.userNm} />
+                            <Form.Control type="text" name="userNm" placeholder="이름" required defaultValue={userInfo?.userNm} />
                         </Col>
                     </Form.Group>
                     <Form.Group as={Row} className="mb-3">
@@ -104,7 +139,7 @@ function UserInfoModal({savedInfo, reloadFunction}){
                             이메일
                         </Form.Label>
                         <Col sm={9}>
-                            <Form.Control type="email" name="email" placeholder="email" required defaultValue={savedInfo?.email} />
+                            <Form.Control type="email" name="email" placeholder="email" required defaultValue={userInfo?.email} />
                         </Col>
                     </Form.Group>
                     <Form.Group as={Row} className="mb-3">
@@ -112,7 +147,15 @@ function UserInfoModal({savedInfo, reloadFunction}){
                             연락처
                         </Form.Label>
                         <Col sm={9}>
-                            <Form.Control type="text" name="phoneNum" placeholder="연락처" required defaultValue={savedInfo?.phoneNum} />
+                            <Form.Control type="text" name="phoneNum" placeholder="연락처" required defaultValue={userInfo?.phoneNum} />
+                        </Col>
+                    </Form.Group>
+                    <Form.Group as={Row} className="mb-3">
+                        <Form.Label column sm={3}>
+                            사용자 유형
+                        </Form.Label>
+                        <Col sm={9}>
+                            <SelectOption name={"userSe"} grpCd={"ACC_TYPE"} selectedValue={userInfo?.userSe} />
                         </Col>
                     </Form.Group>
                     <Form.Group as={Row} className="mb-3">
@@ -120,7 +163,7 @@ function UserInfoModal({savedInfo, reloadFunction}){
                             사용자 권한
                         </Form.Label>
                         <Col sm={9}>
-                            <CheckBox name={"userRole"} grpCd={"ROLE"} selectedValue={savedInfo?.userRole} />
+                            <CheckBox name={"userRole"} grpCd={"ROLE"} selectedValue={userInfo?.userRole} />
                         </Col>
                     </Form.Group>
                     <Form.Group as={Row} className="mb-3">
@@ -128,7 +171,7 @@ function UserInfoModal({savedInfo, reloadFunction}){
                             상태
                         </Form.Label>
                         <Col sm={9}>
-                            <SelectOption name={"status"} grpCd={"ACC_STUS"} selectedValue={savedInfo?.status} />
+                            <SelectOption name={"status"} grpCd={"ACC_STUS"} selectedValue={userInfo?.status} />
                         </Col>
                     </Form.Group>
                     <Row className="mb-3">

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/controller/PopUpApiController.java

@@ -13,7 +13,6 @@ import com.dbnt.kcscbackend.auth.entity.LoginVO;
 import com.dbnt.kcscbackend.config.common.ResponseCode;
 import com.dbnt.kcscbackend.config.common.ResultVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
@@ -162,7 +161,6 @@ public class PopUpApiController {
 
 	}
 
-
 	@Operation(
 			summary = "팝업 비활성화 API",
 			description = "관리자 단에서 '컨텐츠 관리' > '팝업 관리' 페이지에서 팝업을 비활성화 API. 삭제가 아닌 비활성화 임. 삭제는 없음.",
@@ -201,47 +199,6 @@ public class PopUpApiController {
 		return resultVO;
 	}
 
-
-	@Operation(
-			summary = "팝업 활성화 또는 비활성화 설정하는 API",
-			description = "관리자 단에서 '컨텐츠 관리' > '팝업 관리' 페이지에서 '사용여부'를 활성화 또는 비활성화 설정해주는 API.",
-			tags = {"PopUpApiController"}
-	)
-	@ApiResponses(value = {
-			@ApiResponse(responseCode = "200", description = "등록 성공"),
-			@ApiResponse(responseCode = "403", description = "인가된 사용자가 아님"),
-	})
-	@PutMapping(value = "/contents/api/popup-manage/activation-switch/{popupId}")
-	public ResultVO contentsApiPopUpManageUpdateActivationSwitch(
-			HttpServletRequest request,
-			@AuthenticationPrincipal LoginVO loginVO,
-			@ApiParam(value="활성화 여부") @RequestParam(required=true) String checked,
-			@PathVariable("popupId") Long popupId
-	) throws Exception {
-
-		ResultVO resultVO = new ResultVO();
-
-		try {
-			resultVO = popUpApiService.contentsApiPopUpManageUpdateActivationSwitch(resultVO, request, loginVO, checked, popupId);
-		} catch (Exception e) {
-			resultVO.setResultCode(ResponseCode.FAILED.getCode());
-			resultVO.setResultMessage(e.getMessage());
-		}
-
-
-		System.out.println(
-				"\n--------------------------------------------------------------\n" +
-						request.getRequestURI() + " OUT:" +
-						"\n--------------------------------------------------------------\n" +
-						"resultVO.toString():" + "\n" +
-						resultVO.toString() + "\n" +
-						"\n--------------------------------------------------------------\n"
-		);
-
-		return resultVO;
-
-	}
-
 	@Operation(
 			summary = "팝업 내용 불러오기 API",
 			description = "관리자 단에서 '컨텐츠 관리' > '팝업 관리' 페이지에서 저장된 팝업을 불러오는 API",

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/PopUpApiService.java

@@ -4,11 +4,7 @@ import com.dbnt.kcscbackend.admin.contents.popUp.model.CreatePopupVO;
 import com.dbnt.kcscbackend.admin.contents.popUp.model.UpdatePopupVO;
 import com.dbnt.kcscbackend.auth.entity.LoginVO;
 import com.dbnt.kcscbackend.config.common.ResultVO;
-import io.swagger.annotations.ApiParam;
 import org.springframework.data.domain.Pageable;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +14,6 @@ public interface PopUpApiService {
 	public ResultVO contentsApiPopUpManageCreate(ResultVO resultVO, HttpServletRequest request, LoginVO user, final MultipartHttpServletRequest multiRequest, CreatePopupVO createPopupVO) throws Exception;
 	public ResultVO contentsApiPopUpManageRead(ResultVO resultVO, HttpServletRequest request, LoginVO user, Long popupId) throws Exception;
 	public ResultVO contentsApiPopUpManageUpdate(ResultVO resultVO, HttpServletRequest request, LoginVO user, UpdatePopupVO updatePopupVO, Long popupId) throws Exception;
-	public ResultVO contentsApiPopUpManageDelete(ResultVO resultVO, HttpServletRequest request, LoginVO user, Long popupId) throws Exception;
-	public ResultVO contentsApiPopUpManageUpdateActivationSwitch(ResultVO resultVO, HttpServletRequest request, LoginVO user, String checked, Long popupId) throws Exception;
 
+	public ResultVO contentsApiPopUpManageDelete(ResultVO resultVO, HttpServletRequest request, LoginVO user, Long popupId) throws Exception;
 }

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/contents/popUp/service/impl/PopUpApiServiceImpl.java

@@ -236,13 +236,6 @@ public class PopUpApiServiceImpl extends EgovAbstractServiceImpl implements PopU
 		);
 
 
-
-
-
-		Map<String, Object> dto = new HashMap<String, Object>();
-
-		if( false ) {
-			// 삭제 procedure가 삭제가 아닌 비활성화만 시키므로 해당 프로시저 사용 안 함.
 		Map<String, Object> response = tnPopupMngRepository.spDeleteTnPopupMng(
 				popupId.intValue(),
 				"admin",
@@ -250,54 +243,9 @@ public class PopUpApiServiceImpl extends EgovAbstractServiceImpl implements PopU
 				null,
 				null
 		);
-			dto.put("errorMessage", response.get("_error_message") );
-		} else {
-			tnPopupMngRepository.deleteById(popupId);
-		}
-
-
-		dto.put("popupId", popupId );
-
-		resultVO.setResult(dto);
-		resultVO.setResultCode(ResponseCode.SUCCESS.getCode());
-		resultVO.setResultMessage(ResponseCode.SUCCESS.getMessage());
-
-		return resultVO;
-	}
-
-	@Override
-	public ResultVO contentsApiPopUpManageUpdateActivationSwitch(ResultVO resultVO, HttpServletRequest request, LoginVO user, String checked, Long popupId) throws Exception {
-		System.out.println(
-				"\n--------------------------------------------------------------\n" +
-						request.getRequestURI() + " IN:" +
-						"\n--------------------------------------------------------------\n" +
-						"checked:" + "\n" +
-						checked + "\n" +
-						"popupId:" + "\n" +
-						popupId + "\n" +
-						"\n--------------------------------------------------------------\n"
-		);
-
-
-
-		// 유효성 검사 실시
-		int isValid = tnPopupMngRepository.spIsValidTnPopupMngId( popupId.intValue() );
-
-		if( isValid == 0 ) {
-			throw new Exception("대상이 존재하지 않습니다.");
-		}
-
-		TnPopupMng tnPopupMng = tnPopupMngRepository.findByPopupSeq(popupId);
-		if( Boolean.parseBoolean(checked) ) {
-			tnPopupMng.setUseYn("Y");
-		} else {
-			tnPopupMng.setUseYn("N");
-		}
-
-		tnPopupMngRepository.saveAndFlush(tnPopupMng);
-
 
 		Map<String, Object> dto = new HashMap<String, Object>();
+		dto.put("errorMessage", response.get("_error_message") );
 		dto.put("popupId", popupId );
 
 		resultVO.setResult(dto);

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/users/service/AdminUsersService.java

@@ -50,6 +50,7 @@ public class AdminUsersService extends EgovAbstractServiceImpl {
     }
     savedInfo.setEmail(info.getEmail());
     savedInfo.setPhoneNum(info.getPhoneNum());
+    savedInfo.setUserSe(info.getUserSe());
     savedInfo.setUserRole(info.getUserRole());
     savedInfo.setStatus(info.getStatus());
     savedInfo.setLastChgId(updateUser);

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/auth/entity/UserInfo.java

@@ -70,8 +70,6 @@ public class UserInfo extends BoardParams implements UserDetails{
 
   @Transient
   private String passwordChk;
-  @Transient
-  private String statusValue;
 
   @Override
   @JsonIgnore

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/commonCode/entity/TnPopupMng.java

@@ -62,7 +62,6 @@ public class TnPopupMng {
   @NoArgsConstructor
   @AllArgsConstructor
   public static class TnPopupMngId implements Serializable {
-    private static final long serialVersionUID = -6558812991140219351L;
     private String popupSeq;
   }
 

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/commonCode/repository/TnPopupMngRepository.java

@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 
 
-public interface TnPopupMngRepository extends JpaRepository<TnPopupMng, Long> {
+public interface TnPopupMngRepository extends JpaRepository<TnPopupMng, TnPopupMng.TnPopupMngId> {
 
     @Query(value = "CALL sp_add_tn_popup_mng (" +
             ":_popup_title, " +

kcsc-back-end/src/main/resources/mybatisMapper/AdminUsersMapper.xml

@@ -11,8 +11,7 @@
 					a.user_nm,
 					a.phone_num,
 					a.user_role,
-					a.status,
+					c.item_nm as status
-					c.item_nm as status_value
 		from user_info a
 				inner join tc_code_item b on a.user_se = b.item_cd
 				inner join tc_code_item c on a.status = c.item_cd