diff --git a/src/main/java/itn/let/mjo/block/service/impl/MjonBlockDAO.java b/src/main/java/itn/let/mjo/block/service/impl/MjonBlockDAO.java index 475dabe1..d2057977 100644 --- a/src/main/java/itn/let/mjo/block/service/impl/MjonBlockDAO.java +++ b/src/main/java/itn/let/mjo/block/service/impl/MjonBlockDAO.java @@ -19,6 +19,11 @@ public class MjonBlockDAO extends EgovAbstractDAO { return (List)list("MjonBlockDAO.selectBlockList", blockVO); } + @SuppressWarnings("unchecked") + public List selectBlockPhoneList(MjonBlockVO blockVO) throws Exception{ + return (List)list("MjonBlockDAO.selectBlockPhoneList", blockVO); + } + @SuppressWarnings("unchecked") public List selectAdmBlockList(MjonBlockVO blockVO) throws Exception{ return (List)list("MjonBlockDAO.selectAdmBlockList", blockVO); diff --git a/src/main/java/itn/let/mjo/block/service/impl/MjonBlockServiceImpl.java b/src/main/java/itn/let/mjo/block/service/impl/MjonBlockServiceImpl.java index 22e79c65..4227dc15 100644 --- a/src/main/java/itn/let/mjo/block/service/impl/MjonBlockServiceImpl.java +++ b/src/main/java/itn/let/mjo/block/service/impl/MjonBlockServiceImpl.java @@ -1,6 +1,5 @@ package itn.let.mjo.block.service.impl; -import java.util.ArrayList; import java.util.List; import javax.annotation.Resource; @@ -57,9 +56,23 @@ public class MjonBlockServiceImpl extends EgovAbstractServiceImpl implements Mjo @Override public void insertBlockList(MjonBlockVO mjonBlockVO) throws Exception { - List blockList = new ArrayList(); + /* + * 수신거부 목록 신규 등록시 기존 등록 정보와 중복 체크 + * 2024.02.07 우영두 수정 + * */ + MjonBlockVO blockVO = new MjonBlockVO(); + blockVO.setUserId(mjonBlockVO.getUserId()); + blockVO.setBlockType(mjonBlockVO.getBlockType()); + List blockPhoneList = blockDAO.selectBlockPhoneList(blockVO);; for(int i=0; i < mjonBlockVO.getPhoneList().length; i++) { + + if(blockPhoneList.size() > 0) { + if(blockPhoneList.contains(mjonBlockVO.getPhoneList()[i])) { + continue; + } + } + mjonBlockVO.setBlockId(idgenBlockId.getNextStringId()); mjonBlockVO.setPhone(mjonBlockVO.getPhoneList()[i].trim().replaceAll("§", ",")); diff --git a/src/main/java/itn/web/MainController.java b/src/main/java/itn/web/MainController.java index 7b49002e..5c0106bc 100644 --- a/src/main/java/itn/web/MainController.java +++ b/src/main/java/itn/web/MainController.java @@ -107,6 +107,8 @@ import itn.let.mjo.kisa.service.KisaService; import itn.let.mjo.kisa.service.KisaVO; import itn.let.mjo.mjocommon.MjonForienIpChk; import itn.let.mjo.msg.service.MjonMsgVO; +import itn.let.mjo.msgcampain.service.MjonCandidateService; +import itn.let.mjo.msgcampain.service.MjonCandidateVO; import itn.let.mjo.msgdata.service.MjonMsgDataService; import itn.let.mjo.msgdata.service.MjonMsgDataVO; import itn.let.mjo.pay.service.MjonPayService; @@ -258,6 +260,9 @@ public class MainController { @Resource(name = "mberManageService") private EgovMberManageService mberManageService; + @Resource(name = "mjonCandidateService") + private MjonCandidateService mjonCandidateService; + @Value("#{globalSettings['Globals.email.host']}") private String Globals_email_host; @@ -1194,6 +1199,30 @@ public class MainController { } model.addAttribute("prePaymentYn", prePaymentYn); + + /* + * 선거문자 메뉴 선별적 노출을 위하여 후보자 정보조회 + * 비회원, 후부자 정보가 없는 회원은 선거문자가 안보이도록 처리 + * 2024.02.08 우영두 추가 + * + * */ + String userCandidateYn = "N"; + + if(loginVO != null) { + + //선거 후보자 정보 조회 + MjonCandidateVO mjonCandidateVO = mjonCandidateService.selectCandidateDataInfo(userId); + + if(mjonCandidateVO != null) { + + userCandidateYn = "Y"; + + } + + } + + model.addAttribute("userCandidateYn", userCandidateYn); + return "web/com/webCommonHeader"; } diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/block/Block_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/block/Block_SQL_Mysql.xml index a8db9ae4..26722c68 100644 --- a/src/main/resources/egovframework/sqlmap/let/mjo/block/Block_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/mjo/block/Block_SQL_Mysql.xml @@ -52,6 +52,20 @@ LIMIT #recordCountPerPage# OFFSET #firstIndex# + + +