민원 답변문구 조회 수정

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());
 

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<DataObject> 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")){

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;
 		}