From 2b6aafc48f648db022864ce8094ee0b1d975f504 Mon Sep 17 00:00:00 2001 From: leebj Date: Wed, 3 Jul 2024 15:47:15 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AF=BC=EC=9B=90=20=EB=8B=B5=EB=B3=80?= =?UTF-8?q?=EB=AC=B8=EA=B5=AC=20=EC=A1=B0=ED=9A=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java | 4 ++-- .../xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java | 6 +++--- src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java index 9586fd5b..276a62a4 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java @@ -191,7 +191,7 @@ public class CrdnCvlcptMainBean extends AbstractBean { * @param crdnId 단속 ID * @return 답변 예정 문구 */ - public String mappingAnswerWords(String crdnId, String currentUserInstitute, String currentUserAcnt) { + public String mappingAnswerWords(String crdnId, String currentSggCd, String currentUserAcnt) { DataObject dataInfo = crdnInfoMapper.selectCrdnInfo(crdnId); @@ -232,7 +232,7 @@ public class CrdnCvlcptMainBean extends AbstractBean { String joinWords = head + "\n\n" + body + "\n\n" + tail; - ManagedUser currentUser = userMapper.getUser(currentUserAcnt, currentUserInstitute); + ManagedUser currentUser = userMapper.getUser(currentUserAcnt, currentSggCd); String completeWords = this.replaceMacroString(joinWords , currentUser.getPhoneNo(), currentUser.getName()); diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java index 325466e4..0ce56312 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java @@ -139,7 +139,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv //저장된 답변이 없으면 if(ifEmpty(dataObject.string("CVLCPT_PRCS_RSLT_CN"), () -> "").equals("")) { - String resultWords = crdnCvlcptMainBean.mappingAnswerWords(query.getCrdnId(), query.getCurrentInstitute(), query.getCurrentUserAcnt()); + String resultWords = crdnCvlcptMainBean.mappingAnswerWords(query.getCrdnId(), query.getSggCd(), query.getCurrentUserAcnt()); dataObject.set("CVLCPT_PRCS_RSLT_CN", resultWords); } @@ -330,7 +330,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv } @Override - public String updateAnswerTargetProcessStatus(String processType, String currentUserInstitute, String currentUserAcnt, String[] crdnIds) { + public String updateAnswerTargetProcessStatus(String processType, String currentSggCd, String currentUserAcnt, String[] crdnIds) { List targetDataList = crdnCvlcptMapper.selectAnswerTargetList(crdnIds); @@ -356,7 +356,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv if(processType.equals("answerExecute")) { crdnCvlcpt.setCvlcptTrsmCd("04"); if(ifEmpty(targetDataList.get(i).string("CVLCPT_PRCS_RSLT_CN"), () -> "").equals("")) { - String answerWords = crdnCvlcptMainBean.mappingAnswerWords(targetDataList.get(i).string("CRDN_ID"), currentUserInstitute, currentUserAcnt); + String answerWords = crdnCvlcptMainBean.mappingAnswerWords(targetDataList.get(i).string("CRDN_ID"), currentSggCd, currentUserAcnt); crdnCvlcpt.setCvlcptPrcsRsltCn(answerWords); } } else if(processType.equals("answerComplete")){ diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java index bc450018..314d319b 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java @@ -184,7 +184,7 @@ public class Cvlc02Controller extends ApplicationController { mav.addObject("taskSeCd", urlTaskSeCd); query.setTaskSeCd(urlTaskSeCd); - query.setCurrentInstitute(currentUser().getInstitute()); + query.setSggCd(currentUser().getOrgID()); query.setCurrentUserAcnt(currentUser().getAccount()); DataObject cvlcptInfo = crdnCvlcptService.getAnswerPreview(query); mav.addObject("openerPageName", hReq.getParameter("openerPageName")); @@ -228,9 +228,9 @@ public class Cvlc02Controller extends ApplicationController { public ModelAndView updateAnswerTargetProcessStatus(String processType, String... crdnIds) { boolean saved = false; - String currentInstitute = currentUser().getInstitute(); + String currentSggCd = currentUser().getOrgID(); String currentUserAcnt = currentUser().getAccount(); - String rtnMsg = crdnCvlcptService.updateAnswerTargetProcessStatus(processType, currentInstitute, currentUserAcnt, crdnIds); + String rtnMsg = crdnCvlcptService.updateAnswerTargetProcessStatus(processType, currentSggCd, currentUserAcnt, crdnIds); if(rtnMsg.contains("[S]")) { saved = true; }