--no commit message

app/member/src/main/java/com/zrqx/member/bg/pmember/service/PersonalMemberServiceImpl.java

@@ -48,13 +48,9 @@ public class PersonalMemberServiceImpl extends BaseServiceImpl<PersonalMember, S
 		}
 		Member m = new Member();
 		PersonalMember pm = new PersonalMember();
-		if(StringUtils.isNotBlank(form.getId())){
-			m = mmapper.selectByPrimaryKey(form.getId());
-			pm = mapper.selectByPrimaryKey(form.getId());
-		}
 		BeanUtils.copyProperties(form, m);
 		BeanUtils.copyProperties(form, pm);
-		if (form.getId() == null) {
+		if (StringUtils.isBlank(form.getId())) {
 			// 新增
 			synchronized (this) {
 				if(mmapper.isExist(form.getId(),form.getAccount(), null) > 0) {
@@ -84,6 +80,8 @@ public class PersonalMemberServiceImpl extends BaseServiceImpl<PersonalMember, S
 				mapper.insert(pm);
 			}
 		} else {
+			Member old = mmapper.selectByPrimaryKey(form.getId());
+			PersonalMember oldPer = mapper.selectByPrimaryKey(form.getId());
 			// 修改
 			synchronized (this) {
 				if(mmapper.isExist(form.getId(), form.getAccount(), null) > 0) {
@@ -92,7 +90,6 @@ public class PersonalMemberServiceImpl extends BaseServiceImpl<PersonalMember, S
 				if(mmapper.isExist(form.getId(), null, form.getPhone()) > 0) {
 					throw new BaseException("手机号已存在！");
 				}
-				Member old = mmapper.selectByPrimaryKey(m.getId());
 				m.setWechatKey(old.getWechatKey());
 				m.setQqKey(old.getQqKey());
 				m.setUploadTime(old.getUploadTime());