수정건 수정

src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtController.java

@@ -458,5 +458,23 @@ public class CustMgtController {
 		}
 		return custService.updateAdminInfoTotal(updateAdminInfoTotalReqDto);
 	}
+	
+	
+	/**
+	 * date : 2022. 8. 31.
+	 * auth : ckr
+	 * desc : 사용자 ID 중복 체크
+	 * @param paramMap
+	 * @return
+	 * @
+	 */
+	@RequestMapping(value = "/duplicateCheckUserId" , method = {RequestMethod.POST})
+	@ResponseBody
+	public InsertUserResDto duplicateCheckUserId(@RequestBody @Valid InsertUserReqDto insertUserReqDto, BindingResult bindingResult) {
+		if(validComponents.validParameter(bindingResult)) {
+			return new InsertUserResDto(ApiResponseCode.CM_PARAMETER_ERROR);
+		}
+		return custService.duplicateCheckUserId(insertUserReqDto);
+	}
 
 }

src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java

@@ -959,5 +959,27 @@ public class CustMgtService {
 
         return new UpdateAdminInfoTotalResDto(ApiResponseCode.SUCCESS);
     }
-
+    
+    
+    /**
+     * date : 2022. 8. 31. 
+     * auth : ckr 
+     * desc : 사용자 ID 중복체크
+     *
+     * @param insertUserReqDto
+     * @return
+     */   
+    public InsertUserResDto duplicateCheckUserId(InsertUserReqDto insertUserReqDto) {
+        CustMgtMapper custMgtMapper = sqlSessionSlave.getMapper(CustMgtMapper.class);
+        
+        String userId = insertUserReqDto.getUserId();
+        int userCnt = 0;
+        userCnt = custMgtMapper.getUserIdCount(userId);
+        if (userCnt > 0) {
+        	logger.debug("사용자 ID 중복 : {}",userId);
+            return new InsertUserResDto(ApiResponseCode.CE_DUPLICATE_ID);
+        }
+        
+        return new InsertUserResDto(ApiResponseCode.SUCCESS);
+    }
 }

src/main/java/kr/co/uplus/ez/api/riskMgt/RiskMgtService.java

@@ -4,6 +4,8 @@ import kr.co.uplus.ez.api.riskMgt.dto.*;
 import kr.co.uplus.ez.common.data.ApiResponseCode;
 import kr.co.uplus.ez.common.data.Const;
 import kr.co.uplus.ez.common.data.Paging;
+import lombok.extern.slf4j.Slf4j;
+
 import org.mybatis.spring.SqlSessionTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 
+@Slf4j
 @Service
 public class RiskMgtService {
 
@@ -60,7 +63,7 @@ public class RiskMgtService {
 
 		int page = sendNumIntrcpListReqDto.getPage();
 		int pagePerRows = sendNumIntrcpListReqDto.getPagePerRows();
-		page = (page - 1) * pagePerRows;
+		page = (page - 1) * pagePerRows;		
 		sendNumIntrcpListReqDto.setPage(page);
 
 		List<SendNumIntrcpList> sendNumIntrcpListList = riskMgtMapper.selectSndrnoBlckList(sendNumIntrcpListReqDto);

src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtMapper.java

@@ -58,4 +58,6 @@ interface SendNumMgtMapper {
 	int updateSvcUser(UpdateApprReqDto updateApprReqDto);
 	
 	InsertNumberFile selectDownload(InsertNumberFile insertNumberFile);
+
+	List<InsertNumber> selectSndrnoListAll(InsertNumberReqDto insertNumberReqDto);
 }

src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java

@@ -206,11 +206,24 @@ public class SendNumMgtService {
 		String regId = userDetails.getUsername();
 
 		// 2. 중복 발신번호 체크를 위한 조회.
-		List<InsertNumber> dbSendNumbers = sendNumMgtMapper.selectSndrnoList(insertNumberReqDto);
+		List<InsertNumber> dbSendNumbers = null;
 		List<InsertNumber> sendNumbers = insertNumberReqDto.getList();
-
 		List<InsertNumber> allSendNumbers = insertNumberReqDto.getList();
 		List<InsertNumber> duplicateSendNumList = new ArrayList<>();
+		
+		String nmineeDivCd = insertNumberReqDto.getNmineeDivCd();
+		if(StringUtils.equals(nmineeDivCd, "01")) {
+			// 사업자 - 발신 번호 전체 중복 체크
+			dbSendNumbers = sendNumMgtMapper.selectSndrnoListAll(insertNumberReqDto);
+		}else {
+			// 타사업자 - 해당 사업자 발신 번호 한해서만 중복 체크
+			dbSendNumbers = sendNumMgtMapper.selectSndrnoList(insertNumberReqDto);
+		}
+//		List<InsertNumber> dbSendNumbers = sendNumMgtMapper.selectSndrnoList(insertNumberReqDto);
+//		List<InsertNumber> sendNumbers = insertNumberReqDto.getList();
+
+//		List<InsertNumber> allSendNumbers = insertNumberReqDto.getList();
+//		List<InsertNumber> duplicateSendNumList = new ArrayList<>();
 		for (int i=0; i<dbSendNumbers.size(); i++){
 			for (int j=0; j<sendNumbers.size(); j++){
 				String dbSendNum = dbSendNumbers.get(i).getSendNum();

src/main/resources/mapper/mysql/sendNumMgt/sendNumMgt-mapper.xml

@@ -248,6 +248,19 @@
 		</foreach>
 	</select>
 
+	<select id="selectSndrnoListAll" parameterType="kr.co.uplus.ez.api.sendNumMgt.dto.InsertNumberReqDto" resultType="kr.co.uplus.ez.api.sendNumMgt.dto.InsertNumber">
+		/* sendNumMgt-mapper.xml(selectSndrnoListAll) */
+		SELECT
+			SNDRNO AS sendNum
+		FROM
+			hubez_common.EZ_SVC_SNDRNO
+		WHERE 1=1
+		AND SNDRNO IN
+		<foreach collection="list" item="item" index="i" open="(" separator="," close=")">
+			#{item.sendNum}
+		</foreach>
+	</select>
+
 	<select id="selectRegReqNo" resultType="String">
 		SELECT CONCAT(DATE_FORMAT(NOW(), '%Y%m'),  LPAD(hubez_common.FUN_NEXT_SEQ('SNDRNO_REG_SEQ'), 7,  '0')) AS REG_REQ_NO
 	</select>