xit-app
/
external-system-test
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor : 유저테이블 수정

Browse Source
main
이범준 1 year ago
parent a279b4fa12
commit f55794df56
39 changed files with 110 additions and 110 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/kr/xit/fims/biz/cmm/service/bean/FimsCrackdownMgtServiceBean.java
Unescape Escape View File

@ -240,7 +240,7 @@ public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements
} }
erppDTO.setRgtr(getUserInfo().getUniqId()); erppDTO.setRgtr(getUserInfo().getUniqId());
erppDTO.setSysSeCd(getUserInfo().getOrgnztId()); erppDTO.setSysSeCd(getUserInfo().getOrgId());
erppDTO.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())); erppDTO.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode()));
rtCrackdownMgtMapper.insertRtErpp(erppDTO); rtCrackdownMgtMapper.insertRtErpp(erppDTO);
@ -380,7 +380,7 @@ public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements
String ansTxt = getAnswerText(mapper.selectCtznAnswerTmplInfo(ansReqDTO)); String ansTxt = getAnswerText(mapper.selectCtznAnswerTmplInfo(ansReqDTO));
CtznStmtDTO.Ans ansDTO = CtznStmtDTO.Ans.builder() CtznStmtDTO.Ans ansDTO = CtznStmtDTO.Ans.builder()
.sggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())) .sggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode()))
.sysSeCd(getUserInfo().getOrgnztId()) .sysSeCd(getUserInfo().getOrgId())
.interfaceSeqN(saveDTO.getInterfaceSeqN()) .interfaceSeqN(saveDTO.getInterfaceSeqN())
.cvlcptPrcsRsltCn(ansTxt) .cvlcptPrcsRsltCn(ansTxt)
.rgtr(getUserInfo().getUniqId()) .rgtr(getUserInfo().getUniqId())

4
src/main/java/kr/xit/fims/biz/ec/service/bean/EcCctvCrackdownServiceBean.java
Unescape Escape View File

@ -134,7 +134,7 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E
} }
// data set // data set
CctvCrackdownDTO.ExtrlRegltCntc extrDTO = getExtrlRegltCntcDTO(txtNames[0], records); CctvCrackdownDTO.ExtrlRegltCntc extrDTO = getExtrlRegltCntcDTO(txtNames[0], records);
extrDTO.setSysSeCd(getUserInfo().getOrgnztId()); extrDTO.setSysSeCd(getUserInfo().getOrgId());
extrDTO.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())); extrDTO.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode()));
extrDTO.setSggNm(xitFrameCodeService.getSggNm(extrDTO.getSggCd())); extrDTO.setSggNm(xitFrameCodeService.getSggNm(extrDTO.getSggCd()));
@ -196,7 +196,7 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E
// 외부연계 테이블 생성 // 외부연계 테이블 생성
CctvCrackdownDTO.ExtrlRegltCntc extrDTO = CctvCrackdownDTO.ExtrlRegltCntc CctvCrackdownDTO.ExtrlRegltCntc extrDTO = CctvCrackdownDTO.ExtrlRegltCntc
.builder() .builder()
.sysSeCd(getUserInfo().getOrgnztId()) .sysSeCd(getUserInfo().getOrgId())
.sggCd(sggCd) .sggCd(sggCd)
.sggNm(xitFrameCodeService.getSggNm(sggCd)) .sggNm(xitFrameCodeService.getSggNm(sggCd))
.instCd(getUserInfo().getPstinstCode()) .instCd(getUserInfo().getPstinstCode())

2
src/main/java/kr/xit/fims/biz/ec/service/bean/EcCtznSttemntServiceBean.java
Unescape Escape View File

@ -160,7 +160,7 @@ public class EcCtznSttemntServiceBean extends AbstractServiceBean implements EcC
} }
// 답변 테이블 insert(save) // 답변 테이블 insert(save)
dto.setSysSeCd(getUserInfo().getOrgnztId()); dto.setSysSeCd(getUserInfo().getOrgId());
dto.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())); dto.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode()));
dto.setRgtr(getUserInfo().getUniqId()); dto.setRgtr(getUserInfo().getUniqId());
mapper.saveEcCtznSttemntAnswer(dto); mapper.saveEcCtznSttemntAnswer(dto);

6
src/main/java/kr/xit/fims/biz/ec/service/bean/EcNatlNewspaperServiceBean.java
Unescape Escape View File

@ -149,7 +149,7 @@ public class EcNatlNewspaperServiceBean extends AbstractServiceBean implements E
.builder() .builder()
.interfaceSeqN(xmlDto.getInterfaceSeqN()) .interfaceSeqN(xmlDto.getInterfaceSeqN())
.sggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())) .sggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode()))
.sysSeCd(getUserInfo().getOrgnztId()) .sysSeCd(getUserInfo().getOrgId())
.gpsX(dtl.getGpsX()) .gpsX(dtl.getGpsX())
.gpsY(dtl.getGpsY()) .gpsY(dtl.getGpsY())
.vhrno(dtl.getVhrno()) .vhrno(dtl.getVhrno())
@ -217,7 +217,7 @@ public class EcNatlNewspaperServiceBean extends AbstractServiceBean implements E
mst.setInterfaceSeqN(xmlDto.getInterfaceSeqN()); mst.setInterfaceSeqN(xmlDto.getInterfaceSeqN());
mst.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())); mst.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode()));
mst.setSysSeCd(getUserInfo().getOrgnztId()); mst.setSysSeCd(getUserInfo().getOrgId());
mst.setCvlcptAplySeCd(xmlDto.getPetiGubunC()); mst.setCvlcptAplySeCd(xmlDto.getPetiGubunC());
mst.setCvlcptAplyNo(xmlDto.getPetiNoC()); mst.setCvlcptAplyNo(xmlDto.getPetiNoC());
mst.setCvlcptRcptNo(xmlDto.getCivilNoC()); mst.setCvlcptRcptNo(xmlDto.getCivilNoC());
@ -263,7 +263,7 @@ public class EcNatlNewspaperServiceBean extends AbstractServiceBean implements E
//공통 추가 항목 //공통 추가 항목
dtl.setInterfaceSeqN(xmlDto.getInterfaceSeqN()); dtl.setInterfaceSeqN(xmlDto.getInterfaceSeqN());
dtl.setSysSeCd(getUserInfo().getOrgnztId()); dtl.setSysSeCd(getUserInfo().getOrgId());
dtl.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode())); dtl.setSggCd(xitFrameCodeService.instCdToSggCd(getUserInfo().getPstinstCode()));
dtl.setRgtr(getUserInfo().getUniqId()); dtl.setRgtr(getUserInfo().getUniqId());
} }

4
src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java
Unescape Escape View File

@ -37,7 +37,7 @@ public class XitLoginVO implements Serializable{
/** /**
* 조직ID - 시스템코드(sysSeCd) * 조직ID - 시스템코드(sysSeCd)
* */ * */
private String orgnztId; private String orgId;
/** 조직명 */ /** 조직명 */
private String orgnztNm; private String orgnztNm;
/** 고유아이디 */ /** 고유아이디 */
@ -89,7 +89,7 @@ public class XitLoginVO implements Serializable{
this.password = vo.getPassword(); this.password = vo.getPassword();
this.email = vo.getEmailAdres(); this.email = vo.getEmailAdres();
this.userSe = USER_SE.USR.name(); this.userSe = USER_SE.USR.name();
this.orgnztId = vo.getOrgnztId(); this.orgId = vo.getOrgId();
this.orgnztNm = vo.getOrgnztNm(); this.orgnztNm = vo.getOrgnztNm();
this.groupId = vo.getGroupId(); this.groupId = vo.getGroupId();
this.pstinstCode = vo.getPstinstCode(); this.pstinstCode = vo.getPstinstCode();

2
src/main/java/kr/xit/fims/framework/biz/cmm/XitOrgnztInfoVO.java
Unescape Escape View File

@ -26,7 +26,7 @@ public class XitOrgnztInfoVO {
private static final long serialVersionUID = 2971244133704702294L; private static final long serialVersionUID = 2971244133704702294L;
private String orgnztId; //조직 id private String orgId; //조직 id
private String orgnztNm; //조직 명 private String orgnztNm; //조직 명
private String dscrp; //조직 설명 private String dscrp; //조직 설명

10
src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java
Unescape Escape View File

@ -20,7 +20,7 @@ public class XitUserInfoChangeDtlsVO extends BaseVO {
protected String user_id; //사용자 id protected String user_id; //사용자 id
protected String change_de; //변경 일 protected String change_de; //변경 일
protected String orgnzt_id; //조직 id protected String org_id; //조직 id
protected String group_id; //그룹 id protected String group_id; //그룹 id
protected String empl_no; //사원 번호 protected String empl_no; //사원 번호
protected String sexdstn_code; //성별 코드 protected String sexdstn_code; //성별 코드
@ -51,11 +51,11 @@ public class XitUserInfoChangeDtlsVO extends BaseVO {
public void setChange_de(String change_de) { public void setChange_de(String change_de) {
this.change_de = change_de; this.change_de = change_de;
} }
public String getOrgnzt_id() { public String getOrg_id() {
return orgnzt_id; return org_id;
} }
public void setOrgnzt_id(String orgnzt_id) { public void setOrg_id(String org_id) {
this.orgnzt_id = orgnzt_id; this.org_id = org_id;
} }
public String getGroup_id() { public String getGroup_id() {
return group_id; return group_id;

4
src/main/java/kr/xit/fims/framework/biz/cmm/service/XitFrameCodeService.java
Unescape Escape View File

@ -53,12 +53,12 @@ public interface XitFrameCodeService {
/** /**
* <pre>메소드 설명: 조직코드 조회</pre> * <pre>메소드 설명: 조직코드 조회</pre>
* @param tableNm 테이블명 * @param tableNm 테이블명
* @param orgnztId 조직ID * @param orgId 조직ID
* @return Map<String,String> 요청처리 후 응답객체 * @return Map<String,String> 요청처리 후 응답객체
* @author: 박민규 * @author: 박민규
* @date: 2020. 4. 8. * @date: 2020. 4. 8.
*/ */
public XitCodeVO findOrgnztCode(String tableNm, String orgnztId); public XitCodeVO findOrgnztCode(String tableNm, String orgId);
/** /**
* <pre>메소드 설명: 조직코드 목록 조회</pre> * <pre>메소드 설명: 조직코드 목록 조회</pre>
* @param tableNm 테이블명 * @param tableNm 테이블명

6
src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameCodeServiceBean.java
Unescape Escape View File

@ -103,13 +103,13 @@ public class XitFrameCodeServiceBean extends AbstractServiceBean implements XitF
} }
@Override @Override
public XitCodeVO findOrgnztCode(String tableNm, String orgnztId) { public XitCodeVO findOrgnztCode(String tableNm, String orgId) {
/** /**
* 필수값 확인 * 필수값 확인
*/ */
if(XitCmmnUtil.isEmpty(tableNm)) if(XitCmmnUtil.isEmpty(tableNm))
throw new RuntimeException("테이블명(은)는 필수조건 입니다."); throw new RuntimeException("테이블명(은)는 필수조건 입니다.");
if(XitCmmnUtil.isEmpty(orgnztId)) if(XitCmmnUtil.isEmpty(orgId))
throw new RuntimeException("조직ID(은)는 필수조건 입니다."); throw new RuntimeException("조직ID(은)는 필수조건 입니다.");
/** /**
@ -117,7 +117,7 @@ public class XitFrameCodeServiceBean extends AbstractServiceBean implements XitF
*/ */
Map<String, String> m = new HashMap<String, String>(); Map<String, String> m = new HashMap<String, String>();
m.put("tableNm", tableNm); m.put("tableNm", tableNm);
m.put("orgnztId", orgnztId); m.put("orgId", orgId);
/** /**
* 처리 * 처리

10
src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameCrudServiceBean.java
Unescape Escape View File

@ -2873,7 +2873,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF
// * 필수조건 확인 // * 필수조건 확인
// */ // */
// String emsg = null; // String emsg = null;
// if(XitCmmnUtil.isEmpty(vo.getOrgnzt_id())) // if(XitCmmnUtil.isEmpty(vo.getOrg_id()))
// emsg = String.format("(%s)조직ID(은)는 필수조건 입니다.", table); // emsg = String.format("(%s)조직ID(은)는 필수조건 입니다.", table);
// if(emsg!=null){ // if(emsg!=null){
// logger.error(emsg); // logger.error(emsg);
@ -2904,7 +2904,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF
* 필수조건 확인 * 필수조건 확인
*/ */
String emsg = null; String emsg = null;
if(XitCmmnUtil.isEmpty(vo.getOrgnztId())) if(XitCmmnUtil.isEmpty(vo.getOrgId()))
emsg = String.format("(%s)조직ID(은)는 필수조건 입니다.", table); emsg = String.format("(%s)조직ID(은)는 필수조건 입니다.", table);
if(emsg!=null){ if(emsg!=null){
logger.error(emsg); logger.error(emsg);
@ -2935,7 +2935,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF
* 필수조건 확인 * 필수조건 확인
*/ */
String emsg = null; String emsg = null;
if(XitCmmnUtil.isEmpty(vo.getOrgnztId())) if(XitCmmnUtil.isEmpty(vo.getOrgId()))
emsg = String.format("(%s)조직ID(은)는 필수조건 입니다.", table); emsg = String.format("(%s)조직ID(은)는 필수조건 입니다.", table);
if(emsg!=null){ if(emsg!=null){
logger.error(emsg); logger.error(emsg);
@ -2968,7 +2968,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF
* 필수조건 확인 * 필수조건 확인
*/ */
String emsg = null; String emsg = null;
if(XitCmmnUtil.isEmpty(vo.getOrgnztId())) if(XitCmmnUtil.isEmpty(vo.getOrgId()))
emsg = String.format("(%s)조직ID(은)는 필수조건 입니다.", table); emsg = String.format("(%s)조직ID(은)는 필수조건 입니다.", table);
if(emsg!=null){ if(emsg!=null){
logger.error(emsg); logger.error(emsg);
@ -3001,7 +3001,7 @@ public class XitFrameCrudServiceBean extends AbstractServiceBean implements XitF
* 필수조건 확인 * 필수조건 확인
*/ */
String emsg = null; String emsg = null;
if(XitCmmnUtil.isEmpty(vo.getOrgnztId())) if(XitCmmnUtil.isEmpty(vo.getOrgId()))
emsg = String.format("(%s)조직ID(은)는 필수조건 입니다.", table); emsg = String.format("(%s)조직ID(은)는 필수조건 입니다.", table);
if(emsg!=null){ if(emsg!=null){
logger.error(emsg); logger.error(emsg);

2
src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java
Unescape Escape View File

@ -99,7 +99,7 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF
loginVO.convertToLoginVO(userUsrVO); loginVO.convertToLoginVO(userUsrVO);
// 조직id명 설정 // 조직id명 설정
XitOrgnztInfoVO orgnztInfoVO = new XitOrgnztInfoVO(); XitOrgnztInfoVO orgnztInfoVO = new XitOrgnztInfoVO();
orgnztInfoVO.setOrgnztId(userUsrVO.getOrgnztId()); orgnztInfoVO.setOrgId(userUsrVO.getOrgId());
orgnztInfoVO = xitFrameCrudService.findXitOrgnztInfo(orgnztInfoVO); orgnztInfoVO = xitFrameCrudService.findXitOrgnztInfo(orgnztInfoVO);
if (XitCmmnUtil.notEmpty(orgnztInfoVO)) if (XitCmmnUtil.notEmpty(orgnztInfoVO))
loginVO.setOrgnztNm(orgnztInfoVO.getOrgnztNm()); loginVO.setOrgnztNm(orgnztInfoVO.getOrgnztNm());

4
src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitSessionMapping.java
Unescape Escape View File

@ -50,7 +50,7 @@ public class XitSessionMapping extends EgovUsersByUsernameMapping {
String strUserNm = rs.getString("user_nm"); String strUserNm = rs.getString("user_nm");
String strUserSe = rs.getString("user_se"); String strUserSe = rs.getString("user_se");
String strUserEmail = rs.getString("user_email"); String strUserEmail = rs.getString("user_email");
String strOrgnztId = rs.getString("orgnzt_id"); String strOrgId = rs.getString("org_id");
String strGroupId = rs.getString("group_id"); String strGroupId = rs.getString("group_id");
String strPstinstCode = rs.getString("pstinst_code"); String strPstinstCode = rs.getString("pstinst_code");
String strOrgnztNm = rs.getString("orgnzt_nm"); String strOrgnztNm = rs.getString("orgnzt_nm");
@ -71,7 +71,7 @@ public class XitSessionMapping extends EgovUsersByUsernameMapping {
loginVO.setName(strUserNm); //이름 loginVO.setName(strUserNm); //이름
loginVO.setUserSe(strUserSe); //사용자구분 loginVO.setUserSe(strUserSe); //사용자구분
loginVO.setEmail(strUserEmail); //이메일주소 loginVO.setEmail(strUserEmail); //이메일주소
loginVO.setOrgnztId(strOrgnztId); //조직(부서)ID - (시스템코드-sysSeCd) loginVO.setOrgId(strOrgId); //조직(부서)ID - (시스템코드-sysSeCd)
loginVO.setOrgnztNm(strOrgnztNm); //조직(부서)ID 명 loginVO.setOrgnztNm(strOrgnztNm); //조직(부서)ID 명
loginVO.setUniqId(strUniqId); //고유아이디 loginVO.setUniqId(strUniqId); //고유아이디
loginVO.setGroupId(strGroupId); //그룹 loginVO.setGroupId(strGroupId); //그룹

6
src/main/java/kr/xit/fims/framework/biz/cmm/web/XitFrameAnonymousController.java
Unescape Escape View File

@ -124,7 +124,7 @@ public class XitFrameAnonymousController extends AbstractController {
model.addAttribute("passwordHint_result" , xitFrameCodeService.findCmmnDetailCodes("XIT022")); //패스워트힌트코드 목록 model.addAttribute("passwordHint_result" , xitFrameCodeService.findCmmnDetailCodes("XIT022")); //패스워트힌트코드 목록
model.addAttribute("sexdstnCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT014")); //성별구분코드 목록 model.addAttribute("sexdstnCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT014")); //성별구분코드 목록
model.addAttribute("pstinstCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록 model.addAttribute("pstinstCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록
model.addAttribute("orgnztId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록 model.addAttribute("orgId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록
model.addAttribute("groupId_result" , xitFrameCodeService.findGroupCodes("XIT_ORGNZT_INFO")); //그룹정보코드 목록 model.addAttribute("groupId_result" , xitFrameCodeService.findGroupCodes("XIT_ORGNZT_INFO")); //그룹정보코드 목록
break; break;
@ -147,7 +147,7 @@ public class XitFrameAnonymousController extends AbstractController {
// //업무사용자 // //업무사용자
// model.addAttribute("userSttusCode_result" , userSttus_result); //사용자상태코드 목록 // model.addAttribute("userSttusCode_result" , userSttus_result); //사용자상태코드 목록
// model.addAttribute("pstinstCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록 // model.addAttribute("pstinstCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록
// model.addAttribute("orgnztId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록 // model.addAttribute("orgId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록
break; break;
default: default:
@ -186,7 +186,7 @@ public class XitFrameAnonymousController extends AbstractController {
model.addAttribute("groupId_result" , xitFrameCodeService.findGroupCodes("XIT_ORGNZT_INFO")); //그룹정보코드 목록 model.addAttribute("groupId_result" , xitFrameCodeService.findGroupCodes("XIT_ORGNZT_INFO")); //그룹정보코드 목록
model.addAttribute("userSttusCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT013")); //사용자상태코드 목록 model.addAttribute("userSttusCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT013")); //사용자상태코드 목록
model.addAttribute("pstinstCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록 model.addAttribute("pstinstCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록
model.addAttribute("orgnztId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록 model.addAttribute("orgId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록
break; break;
default: default:

2
src/main/java/kr/xit/fims/framework/biz/cmm/web/XitMainController.java
Unescape Escape View File

@ -78,7 +78,7 @@ public class XitMainController extends AbstractController {
// menuManageVO.setTmp_UserSe(user.getUserSe()); // menuManageVO.setTmp_UserSe(user.getUserSe());
// menuManageVO.setTmp_Name(user.getName()); // menuManageVO.setTmp_Name(user.getName());
// menuManageVO.setTmp_Email(user.getEmail()); // menuManageVO.setTmp_Email(user.getEmail());
// menuManageVO.setTmp_OrgnztId(user.getOrgnztId()); // menuManageVO.setTmp_OrgId(user.getOrgId());
// menuManageVO.setTmp_UniqId(user.getUniqId()); // menuManageVO.setTmp_UniqId(user.getUniqId());
model.addAttribute("list_headmenu", xitMainService.findMainMenuHeads(user.getUniqId())); model.addAttribute("list_headmenu", xitMainService.findMainMenuHeads(user.getUniqId()));
model.addAttribute("list_menulist", xitMainService.findtMainMenuLefts(user.getUniqId())); model.addAttribute("list_menulist", xitMainService.findtMainMenuLefts(user.getUniqId()));

18
src/main/java/kr/xit/fims/framework/biz/mng/menu/MenuListMngVO.java
Unescape Escape View File

@ -59,8 +59,8 @@ public class MenuListMngVO {
private String tmp_UserSe; private String tmp_UserSe;
/** tmp_Email */ /** tmp_Email */
private String tmp_Email; private String tmp_Email;
/** tmp_OrgnztId */ /** tmp_OrgId */
private String tmp_OrgnztId; private String tmp_OrgId;
/** tmp_UniqId */ /** tmp_UniqId */
private String tmp_UniqId; private String tmp_UniqId;
/** tmp_Cmd */ /** tmp_Cmd */
@ -278,18 +278,18 @@ public class MenuListMngVO {
this.tmp_Email = tmp_Email; this.tmp_Email = tmp_Email;
} }
/** /**
* tmp_OrgnztId attribute를 리턴한다. * tmp_OrgId attribute를 리턴한다.
* @return String * @return String
*/ */
public String getTmp_OrgnztId() { public String getTmp_OrgId() {
return tmp_OrgnztId; return tmp_OrgId;
} }
/** /**
* tmp_OrgnztId attribute 값을 설정한다. * tmp_OrgId attribute 값을 설정한다.
* @param tmp_OrgnztId String * @param tmp_OrgId String
*/ */
public void setTmp_OrgnztId(String tmp_OrgnztId) { public void setTmp_OrgId(String tmp_OrgId) {
this.tmp_OrgnztId = tmp_OrgnztId; this.tmp_OrgId = tmp_OrgId;
} }
/** /**
* tmp_UniqId attribute를 리턴한다. * tmp_UniqId attribute를 리턴한다.

2
src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java
Unescape Escape View File

@ -25,7 +25,7 @@ public class XitUserInfoVO extends XitUserEtcOptionVO {
private static final long serialVersionUID = -4545167436366021662L; private static final long serialVersionUID = -4545167436366021662L;
// protected String user_id; //사용자 id // protected String user_id; //사용자 id
protected String orgnztId; //조직 id protected String orgId; //조직 id
protected String userNm; //사용자 명 protected String userNm; //사용자 명
protected String password; //비밀번호 protected String password; //비밀번호
protected String password2; //비밀번호 protected String password2; //비밀번호

2
src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserRegMngVO.java
Unescape Escape View File

@ -107,7 +107,7 @@ public class XitUserRegMngVO extends BaseVO {
/** /**
* 조직 ID * 조직 ID
*/ */
private String orgnztId; private String orgId;
/** /**
* 비밀번호 * 비밀번호
*/ */

2
src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java
Unescape Escape View File

@ -251,7 +251,7 @@ public class UserMgtServiceBean extends AbstractServiceBean implements UserMgtSe
return true; return true;
break; break;
case "ORGNZT": //자신이 속한 조직의 모든 사용자 case "ORGNZT": //자신이 속한 조직의 모든 사용자
if(loginSessionVO.getOrgnztId().equals(tgtUserVO.getOrgnztId())) if(loginSessionVO.getOrgId().equals(tgtUserVO.getOrgId()))
return true; return true;
break; break;
default: default:

4
src/main/java/kr/xit/fims/framework/core/XitMenuManageVO.java
Unescape Escape View File

@ -65,8 +65,8 @@ public class XitMenuManageVO {
private String tmpUserSe; private String tmpUserSe;
/** tmp_Email */ /** tmp_Email */
private String tmpEmail; private String tmpEmail;
/** tmp_OrgnztId */ /** tmp_OrgId */
private String tmpOrgnztId; private String tmpOrgId;
/** tmp_UniqId */ /** tmp_UniqId */
private String tmpUniqId; private String tmpUniqId;
/** tmp_Cmd */ /** tmp_Cmd */

2
src/main/resources/message/category/mng/user/reg/message_en.properties
Unescape Escape View File

@ -101,7 +101,7 @@ comUssUmt.deptUserManageRegistBtn.idSearch=Search Duplicate ID
comUssUmt.deptUserManageRegist.crtfcDnValue=User DN comUssUmt.deptUserManageRegist.crtfcDnValue=User DN
comUssUmt.deptUserManageRegist.pstinstCode=Organization Code comUssUmt.deptUserManageRegist.pstinstCode=Organization Code
comUssUmt.deptUserManageRegist.orgnztId=Organization ID comUssUmt.deptUserManageRegist.orgId=Organization ID
comUssUmt.deptUserManageRegist.ofcps=Position comUssUmt.deptUserManageRegist.ofcps=Position
comUssUmt.deptUserManageRegist.emplNum=Employee Number comUssUmt.deptUserManageRegist.emplNum=Employee Number
comUssUmt.deptUserManageRegist.brthdy=Birthday comUssUmt.deptUserManageRegist.brthdy=Birthday

2
src/main/resources/message/category/mng/user/reg/message_ko.properties
Unescape Escape View File

@ -101,7 +101,7 @@ comUssUmt.deptUserManageRegistBtn.idSearch=\uC911\uBCF5\uC544\uC774\uB514 \uAC80
comUssUmt.deptUserManageRegist.crtfcDnValue=\uC0AC\uC6A9\uC790DN comUssUmt.deptUserManageRegist.crtfcDnValue=\uC0AC\uC6A9\uC790DN
comUssUmt.deptUserManageRegist.pstinstCode=\uC18C\uC18D\uAE30\uAD00\uCF54\uB4DC comUssUmt.deptUserManageRegist.pstinstCode=\uC18C\uC18D\uAE30\uAD00\uCF54\uB4DC
comUssUmt.deptUserManageRegist.orgnztId=\uC870\uC9C1\uC544\uC774\uB514 comUssUmt.deptUserManageRegist.orgId=\uC870\uC9C1\uC544\uC774\uB514
comUssUmt.deptUserManageRegist.ofcps=\uC9C1\uC704 comUssUmt.deptUserManageRegist.ofcps=\uC9C1\uC704
comUssUmt.deptUserManageRegist.emplNum=\uC0AC\uBC88 comUssUmt.deptUserManageRegist.emplNum=\uC0AC\uBC88
comUssUmt.deptUserManageRegist.brthdy=\uC0DD\uC77C comUssUmt.deptUserManageRegist.brthdy=\uC0DD\uC77C

2
src/main/resources/spring/service/context-idgen-xit.xml
Unescape Escape View File

@ -133,7 +133,7 @@
<property name="strategy" ref="orgnztStrategy" /> <property name="strategy" ref="orgnztStrategy" />
<property name="blockSize" value="10"/> <property name="blockSize" value="10"/>
<property name="table" value="XIT_IDS"/> <property name="table" value="XIT_IDS"/>
<property name="tableName" value="ORGNZT_ID"/> <property name="tableName" value="ORG_ID"/>
<property name="tableNameFieldName" value="TABLE_NM"/> <property name="tableNameFieldName" value="TABLE_NM"/>
</bean> </bean>
<!-- 조직(부서) ID Generation Strategy Config --> <!-- 조직(부서) ID Generation Strategy Config -->

4
src/main/resources/spring/service/context-security.xml
Unescape Escape View File

@ -50,7 +50,7 @@
<!-- , USER_ADRES --> <!-- , USER_ADRES -->
<!-- , USER_EMAIL --> <!-- , USER_EMAIL -->
<!-- , USER_SE --> <!-- , USER_SE -->
<!-- , '-' ORGNZT_ID --> <!-- , '-' ORG_ID -->
<!-- , ESNTL_ID --> <!-- , ESNTL_ID -->
<!-- , '-' ORGNZT_NM --> <!-- , '-' ORGNZT_NM -->
<!-- FROM COMVNUSERMASTER --> <!-- FROM COMVNUSERMASTER -->
@ -117,7 +117,7 @@
, USER_ADRES , USER_ADRES
, USER_EMAIL , USER_EMAIL
, USER_SE , USER_SE
, ORGNZT_ID , ORG_ID
, ESNTL_ID , ESNTL_ID
, GROUP_ID , GROUP_ID
, PSTINST_CODE , PSTINST_CODE

2
src/main/resources/sql/mapper/framework/cache/cachecode-mysql-mapper.xml vendored
Unescape Escape View File

@ -25,7 +25,7 @@
<when test='type != null and type == "ORGN"'> <when test='type != null and type == "ORGN"'>
/* 조직 코드 */ /* 조직 코드 */
SELECT orgnzt_id AS code SELECT org_id AS code
, orgnzt_nm AS code_val , orgnzt_nm AS code_val
FROM xit_orgnzt_info FROM xit_orgnzt_info
</when> </when>

6
src/main/resources/sql/mapper/framework/cmm/XitFrameCode-mysql-mapper.xml
Unescape Escape View File

@ -58,13 +58,13 @@
/** 조직코드 목록 조회 */ /** 조직코드 목록 조회 */
SELECT SELECT
#{tableNm} AS "grpId" #{tableNm} AS "grpId"
,ORGNZT_ID AS "code" ,ORG_ID AS "code"
,ORGNZT_NM AS "codeVal" ,ORGNZT_NM AS "codeVal"
,DSCRP AS "dscrp" ,DSCRP AS "dscrp"
FROM XIT_ORGNZT_INFO FROM XIT_ORGNZT_INFO
WHERE 1=1 WHERE 1=1
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(orgnztId)"> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(orgId)">
AND ORGNZT_ID LIKE #{orgnztId} AND ORG_ID LIKE #{orgId}
</if> </if>
</select> </select>

46
src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml
Unescape Escape View File

@ -1464,34 +1464,34 @@
<select id="findXitOrgnztInfos" resultType="kr.xit.fims.framework.biz.cmm.XitOrgnztInfoVO"> <select id="findXitOrgnztInfos" resultType="kr.xit.fims.framework.biz.cmm.XitOrgnztInfoVO">
/** findXitOrgnztInfos */ /** findXitOrgnztInfos */
/** 조직정보 다건 조회 */ /** 조직정보 다건 조회 */
SELECT ORGNZT_ID SELECT ORG_ID
,ORGNZT_NM ,ORGNZT_NM
,DSCRP ,DSCRP
FROM XIT_ORGNZT_INFO FROM XIT_ORGNZT_INFO
WHERE 1=1 WHERE 1=1
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(orgnztId)">AND ORGNZT_ID = #{orgnztId}</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(orgId)">AND ORG_ID = #{orgId}</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(orgnztNm)">AND ORGNZT_NM = #{orgnztNm}</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(orgnztNm)">AND ORGNZT_NM = #{orgnztNm}</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(dscrp)">AND DSCRP = #{dscrp}</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(dscrp)">AND DSCRP = #{dscrp}</if>
</select> </select>
<select id="findXitOrgnztInfo" resultType="kr.xit.fims.framework.biz.cmm.XitOrgnztInfoVO"> <select id="findXitOrgnztInfo" resultType="kr.xit.fims.framework.biz.cmm.XitOrgnztInfoVO">
/** findXitOrgnztInfo */ /** findXitOrgnztInfo */
/** 조직정보 조회 */ /** 조직정보 조회 */
SELECT ORGNZT_ID SELECT ORG_ID
,ORGNZT_NM ,ORGNZT_NM
,DSCRP ,DSCRP
FROM XIT_ORGNZT_INFO FROM XIT_ORGNZT_INFO
WHERE 1=1 WHERE 1=1
AND ORGNZT_ID = #{orgnztId} AND ORG_ID = #{orgId}
</select> </select>
<insert id="addXitOrgnztInfo"> <insert id="addXitOrgnztInfo">
/** addXitOrgnztInfo */ /** addXitOrgnztInfo */
/** 조직정보 등록 */ /** 조직정보 등록 */
INSERT INTO XIT_ORGNZT_INFO( INSERT INTO XIT_ORGNZT_INFO(
ORGNZT_ID ORG_ID
,ORGNZT_NM ,ORGNZT_NM
,DSCRP ,DSCRP
)VALUES( )VALUES(
#{orgnzt_id } #{org_id }
,#{orgnzt_nm} ,#{orgnzt_nm}
,#{dscrp} ,#{dscrp}
) )
@ -1504,14 +1504,14 @@
ORGNZT_NM = IFNULL(#{orgnztNm}, ORGNZT_NM) ORGNZT_NM = IFNULL(#{orgnztNm}, ORGNZT_NM)
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(dscrp)">,DSCRP = #{dscrp}</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(dscrp)">,DSCRP = #{dscrp}</if>
WHERE 1=1 WHERE 1=1
AND ORGNZT_ID = #{orgnztId} AND ORG_ID = #{orgId}
</update> </update>
<delete id="removeXitOrgnztInfo"> <delete id="removeXitOrgnztInfo">
/** removeXitOrgnztInfo */ /** removeXitOrgnztInfo */
/** 조직정보 삭제 */ /** 조직정보 삭제 */
DELETE FROM XIT_ORGNZT_INFO DELETE FROM XIT_ORGNZT_INFO
WHERE 1=1 WHERE 1=1
AND ORGNZT_ID = #{orgnztId} AND ORG_ID = #{orgId}
</delete> </delete>
@ -2067,7 +2067,7 @@
/** 사용자정보변경내역 다건 조회 */ /** 사용자정보변경내역 다건 조회 */
SELECT USER_ID SELECT USER_ID
,CHANGE_DE ,CHANGE_DE
,ORGNZT_ID ,ORG_ID
,GROUP_ID ,GROUP_ID
,EMPL_NO ,EMPL_NO
,SEXDSTN_CODE ,SEXDSTN_CODE
@ -2087,7 +2087,7 @@
WHERE 1=1 WHERE 1=1
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(user_id )">AND USER_ID = #{user_id }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(user_id )">AND USER_ID = #{user_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(change_de )">AND CHANGE_DE = #{change_de }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(change_de )">AND CHANGE_DE = #{change_de }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(orgnzt_id )">AND ORGNZT_ID = #{orgnzt_id }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(org_id )">AND ORG_ID = #{org_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(group_id )">AND GROUP_ID = #{group_id }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(group_id )">AND GROUP_ID = #{group_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(empl_no )">AND EMPL_NO = #{empl_no }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(empl_no )">AND EMPL_NO = #{empl_no }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(sexdstn_code )">AND SEXDSTN_CODE = #{sexdstn_code }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(sexdstn_code )">AND SEXDSTN_CODE = #{sexdstn_code }</if>
@ -2109,7 +2109,7 @@
/** 사용자정보변경내역 조회 */ /** 사용자정보변경내역 조회 */
SELECT USER_ID SELECT USER_ID
,CHANGE_DE ,CHANGE_DE
,ORGNZT_ID ,ORG_ID
,GROUP_ID ,GROUP_ID
,EMPL_NO ,EMPL_NO
,SEXDSTN_CODE ,SEXDSTN_CODE
@ -2136,7 +2136,7 @@
INSERT INTO XIT_USER_INFO_CHANGE_DTLS( INSERT INTO XIT_USER_INFO_CHANGE_DTLS(
USER_ID USER_ID
,CHANGE_DE ,CHANGE_DE
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(orgnzt_id )">,ORGNZT_ID </if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(org_id )">,ORG_ID </if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(group_id )">,GROUP_ID </if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(group_id )">,GROUP_ID </if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(empl_no )">,EMPL_NO </if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(empl_no )">,EMPL_NO </if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(sexdstn_code )">,SEXDSTN_CODE </if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(sexdstn_code )">,SEXDSTN_CODE </if>
@ -2155,7 +2155,7 @@
)VALUES( )VALUES(
#{user_id } #{user_id }
,DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') ,DATE_FORMAT(NOW(), '%Y%m%d%H%i%s')
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(orgnzt_id )">,#{orgnzt_id }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(org_id )">,#{org_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(group_id )">,#{group_id }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(group_id )">,#{group_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(empl_no )">,#{empl_no }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(empl_no )">,#{empl_no }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(sexdstn_code )">,#{sexdstn_code }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(sexdstn_code )">,#{sexdstn_code }</if>
@ -2179,7 +2179,7 @@
UPDATE XIT_USER_INFO_CHANGE_DTLS UPDATE XIT_USER_INFO_CHANGE_DTLS
SET SET
CHANGE_DE = DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') CHANGE_DE = DATE_FORMAT(NOW(), '%Y%m%d%H%i%s')
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(orgnzt_id )">,ORGNZT_ID = #{orgnzt_id }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(org_id )">,ORG_ID = #{org_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(group_id )">,GROUP_ID = #{group_id }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(group_id )">,GROUP_ID = #{group_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(empl_no )">,EMPL_NO = #{empl_no }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(empl_no )">,EMPL_NO = #{empl_no }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(sexdstn_code )">,SEXDSTN_CODE = #{sexdstn_code }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(sexdstn_code )">,SEXDSTN_CODE = #{sexdstn_code }</if>
@ -2222,7 +2222,7 @@
/** findXitUserInfos */ /** findXitUserInfos */
/** 사용자정보 다건 조회 */ /** 사용자정보 다건 조회 */
SELECT USER_ID SELECT USER_ID
,ORGNZT_ID ,ORG_ID
,USER_NM ,USER_NM
,PASSWORD ,PASSWORD
,EMPL_NO ,EMPL_NO
@ -2248,7 +2248,7 @@
FROM XIT_USER_INFO FROM XIT_USER_INFO
WHERE 1=1 WHERE 1=1
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(user_id )">AND USER_ID = #{user_id }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(user_id )">AND USER_ID = #{user_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(orgnzt_id )">AND ORGNZT_ID = #{orgnzt_id }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(org_id )">AND ORG_ID = #{org_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(user_nm )">AND USER_NM = #{user_nm }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(user_nm )">AND USER_NM = #{user_nm }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(password )">AND PASSWORD = #{password }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(password )">AND PASSWORD = #{password }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(empl_no )">AND EMPL_NO = #{empl_no }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(empl_no )">AND EMPL_NO = #{empl_no }</if>
@ -2275,7 +2275,7 @@
/** findXitUserInfo */ /** findXitUserInfo */
/** 사용자정보 조회 */ /** 사용자정보 조회 */
SELECT USER_ID SELECT USER_ID
,ORGNZT_ID ,ORG_ID
,USER_NM ,USER_NM
,PASSWORD ,PASSWORD
,EMPL_NO ,EMPL_NO
@ -2308,7 +2308,7 @@
INSERT INSERT
INTO xit_user_info( INTO xit_user_info(
user_id user_id
, orgnzt_id , org_id
, user_nm , user_nm
, password , password
, empl_no , empl_no
@ -2333,7 +2333,7 @@
, REG_DT , REG_DT
) VALUES ( ) VALUES (
#{userId} #{userId}
, #{orgnztId} , #{orgId}
, #{userNm} , #{userNm}
, #{password} , #{password}
, #{emplNo} , #{emplNo}
@ -2364,7 +2364,7 @@
UPDATE XIT_USER_INFO UPDATE XIT_USER_INFO
SET SET
REG_DT = REG_DT REG_DT = REG_DT
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(orgnzt_id )">,ORGNZT_ID = #{orgnzt_id }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(org_id )">,ORG_ID = #{org_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(user_nm )">,USER_NM = #{user_nm }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(user_nm )">,USER_NM = #{user_nm }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(password )">,PASSWORD = #{password }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(password )">,PASSWORD = #{password }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(empl_no )">,EMPL_NO = #{empl_no }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(empl_no )">,EMPL_NO = #{empl_no }</if>
@ -2400,7 +2400,7 @@
/** findsXitUserInfoWithEtcOption */ /** findsXitUserInfoWithEtcOption */
/** 사용자의 정보 및 기타옵션 정보 목록 조회 */ /** 사용자의 정보 및 기타옵션 정보 목록 조회 */
SELECT A.USER_ID SELECT A.USER_ID
,A.ORGNZT_ID ,A.ORG_ID
,A.USER_NM ,A.USER_NM
,A.PASSWORD ,A.PASSWORD
,A.EMPL_NO ,A.EMPL_NO
@ -2431,7 +2431,7 @@
LEFT JOIN XIT_USER_ETC_OPTION B ON A.USER_ID=B.USER_ID LEFT JOIN XIT_USER_ETC_OPTION B ON A.USER_ID=B.USER_ID
WHERE 1=1 WHERE 1=1
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(user_id )">AND A.USER_ID = #{user_id }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(user_id )">AND A.USER_ID = #{user_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(orgnzt_id )">AND A.ORGNZT_ID = #{orgnzt_id }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(org_id )">AND A.ORG_ID = #{org_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(user_nm )">AND A.USER_NM = #{user_nm }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(user_nm )">AND A.USER_NM = #{user_nm }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(password )">AND A.PASSWORD = #{password }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(password )">AND A.PASSWORD = #{password }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(empl_no )">AND A.EMPL_NO = #{empl_no }</if> <if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(empl_no )">AND A.EMPL_NO = #{empl_no }</if>
@ -2462,7 +2462,7 @@
/** findXitUserInfoWithEtcOption */ /** findXitUserInfoWithEtcOption */
/** 사용자의 정보 및 기타옵션 정보 조회 */ /** 사용자의 정보 및 기타옵션 정보 조회 */
SELECT A.USER_ID SELECT A.USER_ID
,A.ORGNZT_ID ,A.ORG_ID
,A.USER_NM ,A.USER_NM
,A.PASSWORD ,A.PASSWORD
,A.EMPL_NO ,A.EMPL_NO

2
src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml
Unescape Escape View File

@ -93,7 +93,7 @@
,A.EMAIL_ADRES AS "emailAdres" ,A.EMAIL_ADRES AS "emailAdres"
,A.OFCPS_NM AS "ofcpsNm" ,A.OFCPS_NM AS "ofcpsNm"
,A.GROUP_ID AS "groupId" ,A.GROUP_ID AS "groupId"
,A.ORGNZT_ID AS "orgnztId" ,A.ORG_ID AS "orgId"
,A.PSTINST_CODE AS "pstinstCode" ,A.PSTINST_CODE AS "pstinstCode"
,A.USER_STTUS_CODE AS "userSttusCode" ,A.USER_STTUS_CODE AS "userSttusCode"
,A.REG_DT AS "regDt" ,A.REG_DT AS "regDt"

14
src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml
Unescape Escape View File

@ -58,7 +58,7 @@
, email_adres , email_adres
, ofcps_nm , ofcps_nm
, group_id , group_id
, orgnzt_id , org_id
, pstinst_code , pstinst_code
, user_sttus_code , user_sttus_code
, REG_DT , REG_DT
@ -72,7 +72,7 @@
INSERT INSERT
INTO xit_user_info( INTO xit_user_info(
user_id user_id
, orgnzt_id , org_id
, user_nm , user_nm
, password , password
, empl_no , empl_no
@ -97,7 +97,7 @@
, REG_DT , REG_DT
) VALUES ( ) VALUES (
#{userId} #{userId}
, #{orgnztId} , #{orgId}
, #{userNm} , #{userNm}
, #{password} , #{password}
, #{emplNo} , #{emplNo}
@ -127,7 +127,7 @@
/* user-mysql-mapper|updateUserInfo-사용자정보 변경|julim */ /* user-mysql-mapper|updateUserInfo-사용자정보 변경|julim */
UPDATE xit_user_info UPDATE xit_user_info
<set> <set>
orgnzt_id = IF(orgnzt_id = #{orgnztId}, orgnzt_id, #{orgnztId}) org_id = IF(org_id = #{orgId}, org_id, #{orgId})
, user_nm = IF(user_nm = #{userNm}, user_nm, #{userNm}) , user_nm = IF(user_nm = #{userNm}, user_nm, #{userNm})
, empl_no = IF(empl_no = #{emplNo}, empl_no, #{emplNo}) , empl_no = IF(empl_no = #{emplNo}, empl_no, #{emplNo})
, sexdstn_code = IF(sexdstn_code = #{sexdstnCode}, sexdstn_code, #{sexdstnCode}) , sexdstn_code = IF(sexdstn_code = #{sexdstnCode}, sexdstn_code, #{sexdstnCode})
@ -159,7 +159,7 @@
<select id="selectCheckUserInfo" parameterType="string" resultType="caseMap"> <select id="selectCheckUserInfo" parameterType="string" resultType="caseMap">
/* user-mysql-mapper|selectCheckUserInfo-사용자정보 esntl_id, group_id 조회|julim */ /* user-mysql-mapper|selectCheckUserInfo-사용자정보 esntl_id, group_id 조회|julim */
SELECT xui.esntl_id SELECT xui.esntl_id
, xui.orgnzt_id , xui.org_id
, xui.group_id , xui.group_id
, xui.pstinst_code , xui.pstinst_code
, ueo.user_manage_author , ueo.user_manage_author
@ -355,7 +355,7 @@
INTO xit_user_info_change_dtls ( INTO xit_user_info_change_dtls (
user_id user_id
, change_de , change_de
, orgnzt_id , org_id
, group_id , group_id
, empl_no , empl_no
, sexdstn_code , sexdstn_code
@ -373,7 +373,7 @@
, esntl_id , esntl_id
) SELECT user_id ) SELECT user_id
, DATE_FORMAT(NOW(), '%Y%m%d%H%i%s') , DATE_FORMAT(NOW(), '%Y%m%d%H%i%s')
, orgnzt_id , org_id
, group_id , group_id
, empl_no , empl_no
, sexdstn_code , sexdstn_code

2
src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml
Unescape Escape View File

@ -98,7 +98,7 @@
</var> </var>
</field> </field>
<field property="orgnztId" depends="required"> <field property="orgId" depends="required">
<arg0 key="조직코드" resource="false"/> <arg0 key="조직코드" resource="false"/>
</field> </field>

2
src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmIntegratedSearchForm.jsp
Unescape Escape View File

@ -53,7 +53,7 @@ Date Author Description
<div class="col-4"> <div class="col-4">
<span class="form-search-linebox"> <span class="form-search-linebox">
<label class="form-label fw-bold form-search-title">시스템구분</label> <label class="form-label fw-bold form-search-title">시스템구분</label>
<code:select id="sysSeCd" name="sysSeCd" defaultSelect='${sessionScope.XitLoginSession.orgnztId}' <code:select id="sysSeCd" name="sysSeCd" defaultSelect='${sessionScope.XitLoginSession.orgId}'
grpId="FIM001" title="단속처리상태" cls="form-select" alt="시스템구분" /> grpId="FIM001" title="단속처리상태" cls="form-select" alt="시스템구분" />
<input type="checkbox" id="" name="" value="Y" class="form-check-input" />전체 <input type="checkbox" id="" name="" value="Y" class="form-check-input" />전체
</span> </span>

2
src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtAnswerTargetDataForm.jsp
Unescape Escape View File

@ -40,7 +40,7 @@
<div class="col-12"> <div class="col-12">
<label class="form-label fw-bold form-search-title">시스템구분</label> <label class="form-label fw-bold form-search-title">시스템구분</label>
<span class="form-search-linebox"> <span class="form-search-linebox">
<code:radio grpId="FIM001" id="sysSeCd" name="sysSeCd" defaultSelect='${sessionScope.XitLoginSession.orgnztId}' <code:radio grpId="FIM001" id="sysSeCd" name="sysSeCd" defaultSelect='${sessionScope.XitLoginSession.orgId}'
onclick="search$$s()" cls="form-check-input" alt="시스템구분"/> onclick="search$$s()" cls="form-check-input" alt="시스템구분"/>
</span> </span>
</div> </div>

2
src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtAnswerWaitDataForm.jsp
Unescape Escape View File

@ -40,7 +40,7 @@
<div class="col-12"> <div class="col-12">
<label class="form-label fw-bold form-search-title">시스템구분</label> <label class="form-label fw-bold form-search-title">시스템구분</label>
<span class="form-search-linebox"> <span class="form-search-linebox">
<code:radio grpId="FIM001" id="sysSeCd" name="sysSeCd" defaultSelect='${sessionScope.XitLoginSession.orgnztId}' <code:radio grpId="FIM001" id="sysSeCd" name="sysSeCd" defaultSelect='${sessionScope.XitLoginSession.orgId}'
onclick="search$$s()" cls="form-check-input" alt="시스템구분"/> onclick="search$$s()" cls="form-check-input" alt="시스템구분"/>
</span> </span>
</div> </div>

2
src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp
Unescape Escape View File

@ -42,7 +42,7 @@
<div class="col-12"> <div class="col-12">
<label class="form-label fw-bold form-search-title">시스템구분</label> <label class="form-label fw-bold form-search-title">시스템구분</label>
<span class="form-search-linebox"> <span class="form-search-linebox">
<code:radio grpId="FIM001" id="sysSeCd" name="sysSeCd" defaultSelect='${sessionScope.XitLoginSession.orgnztId}' <code:radio grpId="FIM001" id="sysSeCd" name="sysSeCd" defaultSelect='${sessionScope.XitLoginSession.orgId}'
onclick="search$$s()" cls="form-check-input" alt="시스템구분"/> onclick="search$$s()" cls="form-check-input" alt="시스템구분"/>
</span> </span>
</div> </div>

6
src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/XitUserReg_input.jsp
Unescape Escape View File

@ -211,11 +211,11 @@ table {
<label class="required">조직코드</label> <label class="required">조직코드</label>
</th> </th>
<td width="30%" > <td width="30%" >
<form:select path="orgnztId" id="orgnztId" title="부서"> <form:select path="orgId" id="orgId" title="부서">
<form:option value="" label="--선택하세요--"/> <form:option value="" label="--선택하세요--"/>
<form:options items="${orgnztId_result}" itemValue="code" itemLabel="codeVal"/> <form:options items="${orgId_result}" itemValue="code" itemLabel="codeVal"/>
</form:select> </form:select>
<form:errors path="orgnztId" cssClass="error"/> <form:errors path="orgId" cssClass="error"/>
</td> </td>
<th width="20%" height="23"> <th width="20%" height="23">
<label class="required">직위명</label> <label class="required">직위명</label>

8
src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/forms/UserForm.jsp
Unescape Escape View File

@ -105,14 +105,14 @@
<tr> <tr>
<th> <th>
<label for="orgnztId" class="required">조직코드</label> <label for="orgId" class="required">조직코드</label>
</th> </th>
<td> <td>
<form:select path="orgnztId" id="orgnztId" title="부서"> <form:select path="orgId" id="orgId" title="부서">
<form:option value="" label="--선택하세요--"/> <form:option value="" label="--선택하세요--"/>
<form:options items="${orgnztId_result}" itemValue="code" itemLabel="codeVal"/> <form:options items="${orgId_result}" itemValue="code" itemLabel="codeVal"/>
</form:select> </form:select>
<form:errors path="orgnztId" cssClass="error"/> <form:errors path="orgId" cssClass="error"/>
</td> </td>
</tr> </tr>
<tr> <tr>

6
src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_edit.jsp
Unescape Escape View File

@ -156,11 +156,11 @@ table {
<label class="required">부서</label> <label class="required">부서</label>
</th> </th>
<td width="30%" > <td width="30%" >
<form:select path="orgnztId" id="orgnztId"> <form:select path="orgId" id="orgId">
<form:option value="" label="--선택하세요--"/> <form:option value="" label="--선택하세요--"/>
<form:options items="${orgnztId_result}" itemValue="code" itemLabel="codeVal"/> <form:options items="${orgId_result}" itemValue="code" itemLabel="codeVal"/>
</form:select> </form:select>
<form:errors path="orgnztId" cssClass="error"/> <form:errors path="orgId" cssClass="error"/>
</td> </td>
<th width="20%" height="23"> <th width="20%" height="23">
<label class="required">직위명</label> <label class="required">직위명</label>

6
src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_input.jsp
Unescape Escape View File

@ -105,11 +105,11 @@
<label class="required">조직코드</label> <label class="required">조직코드</label>
</th> </th>
<td> <td>
<form:select path="orgnztId" id="orgnztId" title="부서"> <form:select path="orgId" id="orgId" title="부서">
<form:option value="" label="--선택하세요--" /> <form:option value="" label="--선택하세요--" />
<form:options items="${orgnztId_result}" itemValue="code" itemLabel="codeVal" /> <form:options items="${orgId_result}" itemValue="code" itemLabel="codeVal" />
</form:select> </form:select>
<form:errors path="orgnztId" cssClass="error" /> <form:errors path="orgId" cssClass="error" />
</td> </td>
<th height="23"> <th height="23">
<label class="required">직위명</label> <label class="required">직위명</label>

6
src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp
Unescape Escape View File

@ -215,11 +215,11 @@ table {
<label class="required">부서</label> <label class="required">부서</label>
</th> </th>
<td> <td>
<form:select path="orgnztId" id="orgnztId"> <form:select path="orgId" id="orgId">
<form:option value="" label="--선택하세요--"/> <form:option value="" label="--선택하세요--"/>
<form:options items="${orgnztId_result}" itemValue="code" itemLabel="codeVal"/> <form:options items="${orgId_result}" itemValue="code" itemLabel="codeVal"/>
</form:select> </form:select>
<form:errors path="orgnztId" cssClass="error"/> <form:errors path="orgId" cssClass="error"/>
</td> </td>
<th height="23"> <th height="23">
<label class="required">직위명</label> <label class="required">직위명</label>

4
src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtPopup.jsp
Unescape Escape View File

@ -103,8 +103,8 @@
<label class="required">조직코드</label> <label class="required">조직코드</label>
</th> </th>
<td> <td>
<code:select type="ORGN" id="orgnztId" name="orgnztId" defaultSelect="${userInfoVO.orgnztId}" title="부서" cls="form-select" alt="부서"/> <code:select type="ORGN" id="orgId" name="orgId" defaultSelect="${userInfoVO.orgId}" title="부서" cls="form-select" alt="부서"/>
<form:errors path="orgnztId" cssClass="error" /> <form:errors path="orgId" cssClass="error" />
</td> </td>
<th height="23"> <th height="23">
<label>직위명</label> <label>직위명</label>

Write Preview
Loading…
Cancel
Save