#61656 【市川市 eモニターシステム】 eモニ会員登録時のメールアドレスの設定について バグ修正

src/main/java/jp/agentec/sinaburocast/action/user/RegistAction.java

@@ -105,11 +105,7 @@ public class RegistAction extends AbstractAction {
 
 
 		List<Member> memberList = new ArrayList<Member>();
 		List<Member> memberList = new ArrayList<Member>();
 
 
-		if (SinaburoUtil.mobileAddressCheck(registForm.email)) {
-			member.subPcEmail = registForm.email;
-		} else {
 		member.mainPcEmail = registForm.email;
 		member.mainPcEmail = registForm.email;
-		}
 
 
 		String id = RandomStringUtils.randomAlphanumeric(6);
 		String id = RandomStringUtils.randomAlphanumeric(6);
 
 
@@ -226,11 +222,9 @@ public class RegistAction extends AbstractAction {
 		}
 		}
 
 
 		// 登録済みのメールアドレスチェック
 		// 登録済みのメールアドレスチェック
-		Member memberInfo = null;
-		if (SinaburoUtil.mobileAddressCheck(registForm.email)) {
+		Member memberInfo = memberService.findByMainPcEmail(registForm.email);
+		if (memberInfo == null) {
 			memberInfo = memberService.findBySubPcEmail(registForm.email);
 			memberInfo = memberService.findBySubPcEmail(registForm.email);
-		} else {
-			memberInfo = memberService.findByMainPcEmail(registForm.email);
 		}
 		}
 
 
 		if (memberInfo != null) {
 		if (memberInfo != null) {

src/main/java/jp/agentec/sinaburocast/logic/MemberRegisterBatchLogic.java

@@ -16,7 +16,11 @@ import javax.mail.MessagingException;
 import javax.mail.Session;
 import javax.mail.Session;
 import javax.mail.Store;
 import javax.mail.Store;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.InternetAddress;
-import javax.transaction.UserTransaction;
+
+import org.apache.commons.lang.RandomStringUtils;
+import org.apache.log4j.Logger;
+import org.seasar.framework.container.annotation.tiger.Component;
+import org.seasar.framework.container.annotation.tiger.InstanceType;
 
 
 import jp.agentec.sinaburocast.common.SinaburoConstant;
 import jp.agentec.sinaburocast.common.SinaburoConstant;
 import jp.agentec.sinaburocast.common.exception.ExpectedException;
 import jp.agentec.sinaburocast.common.exception.ExpectedException;
@@ -29,11 +33,6 @@ import jp.agentec.sinaburocast.service.MemberService;
 import jp.agentec.sinaburocast.service.MessageService;
 import jp.agentec.sinaburocast.service.MessageService;
 import jp.agentec.sinaburocast.vo.EmailKey;
 import jp.agentec.sinaburocast.vo.EmailKey;
 
 
-import org.apache.commons.lang.RandomStringUtils;
-import org.apache.log4j.Logger;
-import org.seasar.framework.container.annotation.tiger.Component;
-import org.seasar.framework.container.annotation.tiger.InstanceType;
-
 @Component(instance=InstanceType.SINGLETON)
 @Component(instance=InstanceType.SINGLETON)
 public class MemberRegisterBatchLogic {
 public class MemberRegisterBatchLogic {
 	private final Logger logger = Logger.getLogger(getClass());
 	private final Logger logger = Logger.getLogger(getClass());
@@ -143,13 +142,11 @@ public class MemberRegisterBatchLogic {
 		Member memberInfo = null;
 		Member memberInfo = null;
 		List<Member> memberList = new ArrayList<Member>();
 		List<Member> memberList = new ArrayList<Member>();
 
 
-		if (SinaburoUtil.mobileAddressCheck(email)) {
-			member.subPcEmail = email;
-			memberInfo = memberService.findBySubPcEmail(email);
-		} else {
-			member.mainPcEmail = email;
 		memberInfo = memberService.findByMainPcEmail(email);
 		memberInfo = memberService.findByMainPcEmail(email);
+		if (memberInfo == null) {
+			memberInfo = memberService.findBySubPcEmail(email);
 		}
 		}
+		member.mainPcEmail = email;
 
 
 		if (memberInfo == null) {
 		if (memberInfo == null) {
 		//未登録済のメールアドレス
 		//未登録済のメールアドレス