Merge branch 'master' of https://git.loafle.net/overflow/central
This commit is contained in:
commit
c54bbf07ed
|
@ -173,6 +173,10 @@ public class CentralMemberService implements MemberService {
|
||||||
String email = SessionMetadata.getTargetID();
|
String email = SessionMetadata.getTargetID();
|
||||||
Member preMember = this.memberDAO.findByEmail(member.getEmail());
|
Member preMember = this.memberDAO.findByEmail(member.getEmail());
|
||||||
|
|
||||||
|
if (null == preMember || 0 >= preMember.getId()) {
|
||||||
|
throw new OverflowException("SigninId Not Exist()", new Throwable());
|
||||||
|
}
|
||||||
|
member.setId(preMember.getId());
|
||||||
if (null != pw && !pw.equals("")) {
|
if (null != pw && !pw.equals("")) {
|
||||||
boolean checkPass = this.isPasswordStrong(pw);
|
boolean checkPass = this.isPasswordStrong(pw);
|
||||||
|
|
||||||
|
@ -192,6 +196,7 @@ public class CentralMemberService implements MemberService {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (member.getStatus() == null || member.getStatus().getId() <= 0) {
|
if (member.getStatus() == null || member.getStatus().getId() <= 0) {
|
||||||
|
member.setStatus(new MetaMemberStatus());
|
||||||
member.getStatus().setId(preMember.getStatus().getId());
|
member.getStatus().setId(preMember.getStatus().getId());
|
||||||
}
|
}
|
||||||
return this.modify(member);
|
return this.modify(member);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user