style: 팝업 내용변경 시 수정된 내용 화면에 반영 안 되는 이슈 작업(시스템 관리 대메뉴)

src/main/java/kr/xit/framework/biz/mng/auth/mapper/IAuthGrpMgtMapper.java

@@ -22,7 +22,7 @@ import kr.xit.framework.biz.mng.auth.model.XitAuthorGroupInfoVO;
 public interface IAuthGrpMgtMapper {
 
 	List<XitAuthorGroupInfoVO> selectAuthorGroupInfos(final Map<String, Object> paraMap, final RowBounds rowBounds);
-	XitAuthorGroupInfoVO selectAuthorGroupInfo(final String groupId);
+	<T> XitAuthorGroupInfoVO selectAuthorGroupInfo(final T t);
 	int insertAuthorGroupInfo(final XitAuthorGroupInfoVO vo);
 	int updateAuthorGroupInfo(final XitAuthorGroupInfoVO vo);
 	int deleteAuthorGroupInfo(final String groupId);

src/main/java/kr/xit/framework/biz/mng/auth/service/AuthAuthorMgtService.java

@@ -42,8 +42,8 @@ public class AuthAuthorMgtService implements IAuthAuthorMgtService {
 
     @Override
 	@Transactional(readOnly = true)
-	public XitAuthorInfoVO findAuthAuthor(final String authorCode) {
+	public <T> XitAuthorInfoVO findAuthAuthor(final T t) {
-		return mapper.selectAuthorInfo(authorCode);
+		return mapper.selectAuthorInfo(t);
 	}
 
 	/* =====================================================

src/main/java/kr/xit/framework/biz/mng/auth/service/AuthGrpMgtService.java

@@ -42,8 +42,8 @@ public class AuthGrpMgtService implements IAuthGrpMgtService {
 
 	@Override
 	@Transactional(readOnly = true)
-	public XitAuthorGroupInfoVO findAuthGrp(final String groupId) {
+	public <T> XitAuthorGroupInfoVO findAuthGrp(final T t) {
-		return mapper.selectAuthorGroupInfo(groupId);
+		return mapper.selectAuthorGroupInfo(t);
 	}
 
 	@Override

src/main/java/kr/xit/framework/biz/mng/auth/service/AuthRoleMgtService.java

@@ -33,8 +33,8 @@ public class AuthRoleMgtService implements IAuthRoleMgtService {
 
 	@Override
 	@Transactional(readOnly = true)
-	public XitRoleInfoVO findAuthRole(final String roleCode) {
+	public <T> XitRoleInfoVO findAuthRole(final T t) {
-		return mapper.selectAuthRole(roleCode);
+		return mapper.selectAuthRole(t);
 	}
 
 	@Override

src/main/java/kr/xit/framework/biz/mng/auth/service/IAuthAuthorMgtService.java

@@ -23,7 +23,7 @@ public interface IAuthAuthorMgtService {
 
 	/**
 	 * <pre>메소드 설명: 권한관리 목록 조회</pre>
-	 * @param searchVO
+	 * @param paraMap
 	 * @return List<XitAuthRegMngVO> 요청처리 후 응답객체
 	 * @author: 박민규
 	 * @date: 2020. 4. 16.
@@ -31,7 +31,7 @@ public interface IAuthAuthorMgtService {
 	List<XitAuthorInfoVO> findAuthAuthors(final Map<String,Object> paraMap, final RowBounds rowBounds);
 	List<XitAuthorInfoVO> findAuthAuthors(final Map<String,Object> paraMap);
 
-	XitAuthorInfoVO findAuthAuthor(final String authorCode);
+	<T> XitAuthorInfoVO findAuthAuthor(final T t);
 	void addAuthAuthor(final XitAuthorInfoVO vo);
 	void modifyAuthAuthor(final XitAuthorInfoVO vo);
 	void removeAuthAuthor(final String authorCode);

src/main/java/kr/xit/framework/biz/mng/auth/service/IAuthGrpMgtService.java

@@ -20,7 +20,7 @@ import kr.xit.framework.biz.mng.auth.model.XitAuthorGroupInfoVO;
 public interface IAuthGrpMgtService {
 
 	List<XitAuthorGroupInfoVO> findAuthGrps(final Map<String,Object> paraMap, final RowBounds rowBounds);
-	XitAuthorGroupInfoVO findAuthGrp(final String groupId);
+	<T> XitAuthorGroupInfoVO findAuthGrp(final T t);
 	void addAuthGrp(final XitAuthorGroupInfoVO vo);
 	void modifyAuthGrp(final XitAuthorGroupInfoVO vo);
 	void removeAuthGrp(final String authorCode);

src/main/java/kr/xit/framework/biz/mng/auth/service/IAuthRoleMgtService.java

@@ -22,7 +22,7 @@ public interface IAuthRoleMgtService {
 
 	/**
 	 * <pre>메소드 설명: 롤관리 목록 조회</pre>
-	 * @param searchVO
+	 * @param paraMap
 	 * @return List<XitAuthRuleMngVO> 요청처리 후 응답객체
 	 * @author: 박민규
 	 * @date: 2020. 4. 16.
@@ -31,12 +31,12 @@ public interface IAuthRoleMgtService {
 	
 	/**
 	 * <pre>메소드 설명: 롤관리 상세정보 조회</pre>
-	 * @param vo
+	 * @param t
 	 * @return XitAuthRuleMngVO 요청처리 후 응답객체
 	 * @author: 박민규
 	 * @date: 2020. 4. 16.
 	 */
-	XitRoleInfoVO findAuthRole(final String roleCode);
+	<T> XitRoleInfoVO findAuthRole(final T t);
 	
 	/**
 	 * <pre>메소드 설명: 롤관리 등록</pre>

src/main/java/kr/xit/framework/biz/mng/auth/web/AuthAuthorMgtController.java

@@ -50,14 +50,14 @@ public class AuthAuthorMgtController {
 	}
 
 	@RequestMapping(value = "/mngAuthAuthorMgtPopup")
-	public ModelAndView mngAuthAuthorMgtPopup(@ModelAttribute final XitAuthorInfoVO vo){
+	public ModelAndView mngAuthAuthorMgtPopup(final XitAuthorInfoVO vo){
 		ModelAndView mav = new ModelAndView();
 
 		if(Checks.isEmpty(vo) || Checks.isEmpty(vo.getAuthorCode())){
 			mav.addObject("authorInfoVO", new XitAuthorInfoVO());
 			mav.addObject("pageTitle", "권한 등록");
 		} else {
-			mav.addObject("authorInfoVO", vo);
+			mav.addObject("authorInfoVO", service.findAuthAuthor(vo));
 			mav.addObject("pageTitle", "권한 변경");
 		}
 		mav.setViewName(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/mngAuthAuthorMgtPopup.popup");

src/main/java/kr/xit/framework/biz/mng/auth/web/AuthGrpMgtController.java

@@ -57,7 +57,7 @@ public class AuthGrpMgtController {
 			mav.addObject("groupManage", new XitAuthorGroupInfoVO());
 			mav.addObject("pageTitle", "권한그룹 등록");
 		} else {
-			mav.addObject("groupManage", vo);
+			mav.addObject("groupManage", service.findAuthGrp(vo));
 			mav.addObject("pageTitle", "권한그룹 변경");
 		}
 		mav.setViewName(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/mngAuthGrpMgtPopup.popup");

src/main/java/kr/xit/framework/biz/mng/auth/web/AuthRoleMgtController.java

@@ -57,7 +57,7 @@ public class AuthRoleMgtController {
 			mav.addObject("roleManage", new XitRoleInfoVO());
 			mav.addObject("pageTitle", "롤 등록");
 		} else {
-			mav.addObject("roleManage", vo);
+			mav.addObject("roleManage", service.findAuthRole(vo));
 			mav.addObject("pageTitle", "롤 정보 변경");
 		}
 		mav.setViewName(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/mngAuthRoleMgtPopup.popup");

src/main/java/kr/xit/framework/biz/mng/bbs/model/XitBbsTmplateMngVO.java

@@ -70,4 +70,7 @@ public class XitBbsTmplateMngVO {
     /** 사용여부 */
     private String useAt;
 
+    /** 코드 명 */
+    private String codeNm;
+
 }

src/main/java/kr/xit/framework/biz/mng/bbs/web/BoardTmplMgtController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import kr.xit.framework.support.util.Checks;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
@@ -56,8 +57,13 @@ public class BoardTmplMgtController {
 
 		ModelAndView mav = new ModelAndView();
 
-		mav.addObject("templateInf", vo);
+		if(Checks.isEmpty(vo.getTmplatId())){
-		mav.addObject("pageTitle", "게시판 템플릿 등록 / 변경");
+			mav.addObject("templateInf", vo);
+			mav.addObject("pageTitle", "게시판 템플릿 등록");
+		} else {
+			mav.addObject("templateInf", service.findBoardTmpl(vo));
+			mav.addObject("pageTitle", "게시판 템플릿 변경");
+		}
 		mav.setViewName(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH + "mng/bbs/mngBoardTmplMgtPopup.popup");
 		return mav;
 	}

src/main/java/kr/xit/framework/biz/mng/code/mapper/ICodeCfnMgtMapper.java

@@ -12,7 +12,7 @@ import kr.xit.framework.biz.mng.code.model.XitClCodeMngVO;
 public interface ICodeCfnMgtMapper {
 
 	List<XitClCodeMngVO> selectCmmnClCodes(final Map<String, Object> paraMap, final RowBounds rowBounds);
-	XitClCodeMngVO selectCmmnClCode(final String clCode);
+	<T> XitClCodeMngVO selectCmmnClCode(final T t);
 
 	int insertCmmnClCode(final XitClCodeMngVO vo);
 	int updateCmmnClCode(final XitClCodeMngVO vo);

src/main/java/kr/xit/framework/biz/mng/code/model/XitDetailCodeMngVO.java

@@ -79,4 +79,9 @@ public class XitDetailCodeMngVO {
 	 */
 	private String lastUpdusrId;
 
+	/*
+	 * 분류 코드
+	 */
+	private String clCode;
+
 }

src/main/java/kr/xit/framework/biz/mng/code/service/CodeCfnMgtService.java

@@ -30,6 +30,10 @@ public class CodeCfnMgtService implements ICodeCfnMgtService {
 		return mapper.selectCmmnClCodes(paraMap, rowBounds);
 	}
 
+	@Override
+	@Transactional(readOnly = true)
+	public <T> XitClCodeMngVO findCodeCfn(final T t){return mapper.selectCmmnClCode(t);}
+
 	@Override
 	@Transactional
 	public void addCodeCfn(final XitClCodeMngVO vo) {

src/main/java/kr/xit/framework/biz/mng/code/service/CodeDtlMgtService.java

@@ -26,6 +26,10 @@ public class CodeDtlMgtService implements ICodeDtlMgtService {
 		return mapper.selectCmmnDtlCodes(paraMap, rowBounds);
 	}
 
+	@Override
+	@Transactional(readOnly = true)
+	public <T> XitDetailCodeMngVO findCodeDtl(final T t){return mapper.selectCmmnDtlCode(t);}
+
 	@Override
 	@Transactional
 	public void addCodeDtl(final XitDetailCodeMngVO vo) {

src/main/java/kr/xit/framework/biz/mng/code/service/CodeGrpMgtService.java

@@ -30,6 +30,10 @@ public class CodeGrpMgtService implements ICodeGrpMgtService {
 		return mapper.selectCmmnGrpCodes(paraMap, rowBounds);
 	}
 
+	@Override
+	@Transactional(readOnly = true)
+	public <T> XitCmmnCodeMngVO findCodeGrp(final T t){return mapper.selectCmmnGrpCode(t);}
+
 	@Override
 	@Transactional(readOnly = true)
 	public void addCodeGrp(final XitCmmnCodeMngVO vo) {

src/main/java/kr/xit/framework/biz/mng/code/service/ICodeCfnMgtService.java

@@ -23,6 +23,8 @@ public interface ICodeCfnMgtService {
 
 	List<XitClCodeMngVO> findCodeCfns(final Map<String, Object> paraMap, final RowBounds rowBounds);
 	
+	<T> XitClCodeMngVO findCodeCfn(final T t);
+
 	void addCodeCfn(final XitClCodeMngVO vo);
 
 	void modifyCodeCfn(final XitClCodeMngVO vo);

src/main/java/kr/xit/framework/biz/mng/code/service/ICodeDtlMgtService.java

@@ -23,6 +23,8 @@ public interface ICodeDtlMgtService {
 
 	List<XitDetailCodeMngVO> findCodeDtls(final Map<String, Object> paraMap, final RowBounds rowBounds);
 
+	<T> XitDetailCodeMngVO findCodeDtl(final T t);
+
 	void addCodeDtl(final XitDetailCodeMngVO vo);
 
 	void modifyCodeDtl(final XitDetailCodeMngVO vo);

src/main/java/kr/xit/framework/biz/mng/code/service/ICodeGrpMgtService.java

@@ -23,6 +23,8 @@ public interface ICodeGrpMgtService {
 
 	List<XitCmmnCodeMngVO> findCodeGrps(final Map<String, Object> paraMap, final RowBounds rowBounds);
 
+	<T> XitCmmnCodeMngVO findCodeGrp(final T t);
+
 	void addCodeGrp(final XitCmmnCodeMngVO vo);
 
 	void modifyCodeGrp(final XitCmmnCodeMngVO vo);

src/main/java/kr/xit/framework/biz/mng/code/web/CodeCfnMgtController.java

@@ -2,9 +2,7 @@ package kr.xit.framework.biz.mng.code.web;
 
 import java.util.Map;
 
-import javax.annotation.Resource;
+import kr.xit.framework.support.util.Checks;
-
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,11 +13,8 @@ import org.springframework.web.servlet.ModelAndView;
 
 import kr.xit.framework.biz.mng.code.model.XitClCodeMngVO;
 import kr.xit.framework.biz.mng.code.service.ICodeCfnMgtService;
-import kr.xit.framework.biz.mng.menu.model.XitMenuInfoVO;
 import kr.xit.framework.core.constants.FrameworkConstants;
-import kr.xit.framework.core.message.XitMessageSource;
 import kr.xit.framework.core.model.ResultResponse;
-import kr.xit.framework.core.validation.XitBeanValidator;
 import kr.xit.framework.support.mybatis.MybatisUtils;
 import kr.xit.framework.support.util.AjaxMessageMapRenderer;
 import kr.xit.framework.support.util.ValidationError;
@@ -41,8 +36,13 @@ public class CodeCfnMgtController {
 	public ModelAndView mngCodeCfnMgtPopup(final XitClCodeMngVO vo) {
 		ModelAndView mav = new ModelAndView();
 
-		mav.addObject("cmmnClCode", vo);
+		if(Checks.isEmpty(vo.getClCode())){
-		mav.addObject("pageTitle", "분류 코드 등록 / 변경");
+			mav.addObject("cmmnClCode", vo);
+			mav.addObject("pageTitle", "분류 코드 등록");
+		} else {
+			mav.addObject("cmmnClCode", service.findCodeCfn(vo));
+			mav.addObject("pageTitle", "분류 코드 변경");
+		}
 		mav.setViewName(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH + "mng/code/mngCodeCfnMgtPopup.popup");
 		return mav;
 	}

src/main/java/kr/xit/framework/biz/mng/code/web/CodeDtlMgtController.java

@@ -2,6 +2,7 @@ package kr.xit.framework.biz.mng.code.web;
 
 import java.util.Map;
 
+import kr.xit.framework.support.util.Checks;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,8 +38,14 @@ public class CodeDtlMgtController {
 		ModelAndView mav = new ModelAndView();
 
 		mav.addObject("cfnCodeList", CacheServiceUtils.getComboCodes(null, "CMM_CFN"));
-		mav.addObject("cmmnDetailCode", vo);
+
-		mav.addObject("pageTitle", "공통 코드 등록 / 변경");
+		if(Checks.isEmpty(vo.getCodeId())){
+			mav.addObject("cmmnDetailCode", vo);
+			mav.addObject("pageTitle", "공통 코드 등록");
+		} else {
+			mav.addObject("cmmnDetailCode", service.findCodeDtl(vo));
+			mav.addObject("pageTitle", "공통 코드 변경");
+		}
 		mav.setViewName(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH + "mng/code/mngCodeDtlMgtPopup.popup");
 		return mav;
 	}

src/main/java/kr/xit/framework/biz/mng/code/web/CodeGrpMgtController.java

@@ -2,6 +2,7 @@ package kr.xit.framework.biz.mng.code.web;
 
 import java.util.Map;
 
+import kr.xit.framework.support.util.Checks;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -35,8 +36,13 @@ public class CodeGrpMgtController {
 	public ModelAndView mngCodeGrpMgtPopup(final XitCmmnCodeMngVO vo) {
 		ModelAndView mav = new ModelAndView();
 
-		mav.addObject("cmmnCode", vo);
+		if(Checks.isEmpty(vo.getCodeId())){
-		mav.addObject("pageTitle", "공통 코드 그룹 등록 / 변경");
+			mav.addObject("cmmnCode", vo);
+			mav.addObject("pageTitle", "공통 코드 그룹 등록");
+		} else {
+			mav.addObject("cmmnCode", service.findCodeGrp(vo));
+			mav.addObject("pageTitle", "공통 코드 그룹 변경");
+		}
 		mav.setViewName(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH + "mng/code/mngCodeGrpMgtPopup.popup");
 		return mav;
 	}

src/main/java/kr/xit/framework/biz/mng/menu/service/IMenuMgtService.java

@@ -29,6 +29,7 @@ public interface IMenuMgtService {
 	 * @date: 2022. 10. 18.
 	 */
 	List<XitMenuInfoVO> findMenus(final Map<String, Object> paraMap, final RowBounds rowBounds);
+	<T> XitMenuInfoVO findMenu(final T t);
 	
 	void addMenu(final XitMenuInfoVO vo);
 	void modifyMenu(final XitMenuInfoVO vo);

src/main/java/kr/xit/framework/biz/mng/menu/service/MenuMgtService.java

@@ -45,6 +45,10 @@ public class MenuMgtService implements IMenuMgtService {
 		return mapper.selectMenuInfos(paraMap, rowBounds);
 	}
 
+	@Override
+	@Transactional(readOnly = true)
+	public <T> XitMenuInfoVO findMenu(final T t){return mapper.selectMenuInfo(t); }
+
 	@Override
 	@Transactional
 	public void addMenu(final XitMenuInfoVO vo) {

src/main/java/kr/xit/framework/biz/mng/menu/web/MenuMgtController.java

@@ -12,6 +12,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import kr.xit.framework.support.util.Checks;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -71,8 +72,14 @@ public class MenuMgtController {
 	public ModelAndView mngMenuMgtPopup(final XitMenuInfoVO vo) {
 		ModelAndView mav = new ModelAndView();
 
-		mav.addObject("menuManageVO", vo);
+
-		mav.addObject("pageTitle", "메뉴 정보 등록 / 변경");
+		if(Checks.isEmpty(vo.getMenuNm())){
+			mav.addObject("menuManageVO", vo);
+			mav.addObject("pageTitle", "메뉴 정보 등록");
+		} else {
+			mav.addObject("menuManageVO", service.findMenu(vo));
+			mav.addObject("pageTitle", "메뉴 정보 변경");
+		}
 		mav.setViewName(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/menu/mngMenuMgtPopup.popup");
 		return mav;
 	}

src/main/resources/sqlmapper/framework/mng/auth/auth-role-mysql-mapper.xml

@@ -16,7 +16,7 @@
 			 , role_creat_de
 		  FROM xit_role_info
 		<where>
-			<if test="@kr.xit.framework.core.utils.XitCmmnUtil@notEmpty(RoleCode)">
+			<if test="@kr.xit.framework.core.utils.XitCmmnUtil@notEmpty(roleCode)">
 		   AND role_code = #{roleCode}
 		    </if>
 			<if test="@kr.xit.framework.core.utils.XitCmmnUtil@notEmpty(roleNm)">

src/main/resources/sqlmapper/framework/mng/bbs/board-tmpl-mysql-mapper.xml

@@ -26,9 +26,6 @@
 		<where>
 			<if test="@kr.xit.framework.core.utils.XitCmmnUtil@notEmpty(tmplatSeCode)">
 		   AND xti.tmplat_se_code = #{tmplatSeCode}
-			</if>
-			<if test="@kr.xit.framework.core.utils.XitCmmnUtil@notEmpty(tmplatNm)">
-		   AND INSTR(xti.tmplat_nm, #{tmplatNm}) > 0
 			</if>
 			<if test="@kr.xit.framework.core.utils.XitCmmnUtil@notEmpty(codeNm)">
 		   AND INSTR(cdc.code_nm #{codeNm}) > 0
@@ -39,12 +36,18 @@
 	<select id="selectBoardTmpls" resultType="kr.xit.framework.biz.mng.bbs.model.XitBbsTmplateMngVO">
 		/* board-tmpl-mysql-mapper|selectBoardTmpls-템플릿 목록 조회|julim */
 		<include refid="sqlTmplInfo"/>
+		<if test="@kr.xit.framework.core.utils.XitCmmnUtil@notEmpty(tmplatNm)">
+			AND INSTR(xti.tmplat_nm, #{tmplatNm}) > 0
+		</if>
 		 ORDER BY xti.frst_regist_pnttm DESC
 	</select>
 
 	<select id="selectBoardTmpl" resultType="kr.xit.framework.biz.mng.bbs.model.XitBbsTmplateMngVO">
 		/* board-tmpl-mysql-mapper|selectBoardTmpl-템플릿 정보 조회|julim */
 		<include refid="sqlTmplInfo"/>
+		<if test="@kr.xit.framework.core.utils.XitCmmnUtil@notEmpty(tmplatId)">
+			AND xti.tmplat_id = #{tmplatId}
+		</if>
 	</select>
 
 	<insert id="insertBoardTmpl">

src/main/resources/sqlmapper/framework/mng/code/code-dtl-mysql-mapper.xml

@@ -94,7 +94,9 @@
 		     , etc_1 = IF(etc_1 = #{etc1}, etc_1, #{etc1})
 		     , etc_2 = IF(etc_2 = #{etc2}, etc_2, #{etc2})
 		     , etc_3 = IF(etc_3 = #{etc3}, etc_3, #{etc3})
-		     , ordr = IF(ordr = #{ordr}, ordr, #{ordr})
+			<if test="@kr.xit.framework.core.utils.XitCmmnUtil@notEmpty(ordr)">
+			 , ordr = IF(ordr = #{ordr}, ordr, #{ordr})
+			</if>
 		     , use_at = IF(use_at = #{useAt}, use_at, #{useAt})
 			 , last_updt_pnttm = NOW()
 			 , last_updusr_id = #{lastUpdusrId}