|
|
@ -100,11 +100,18 @@ public class ProjectService implements IProjectService{ |
|
|
|
//TODO 手机号为空暂时跳过
|
|
|
|
continue; |
|
|
|
} |
|
|
|
Long userIdByPhone = userDao.getUserIdByPhone(member.getPhone()); |
|
|
|
Long userIdByPhone = userDao.getUserIdByPhone(memberInfo.getPhone()); |
|
|
|
if (ObjectUtil.isNotNull(userIdByPhone)){ |
|
|
|
//如果userId重复,就使用之前的memberId
|
|
|
|
if (userIdAndMemberId.containsKey(userIdByPhone)){ |
|
|
|
member.setId(userIdAndMemberId.get(userIdByPhone)); |
|
|
|
}else{ |
|
|
|
member.setId(snowflake.nextId()); |
|
|
|
member.setProjectId(param.getProjectId()); |
|
|
|
member.setPhone(memberInfo.getPhone()); |
|
|
|
member.setName(memberInfo.getMemberName()); |
|
|
|
member.setUserId(userIdByPhone); |
|
|
|
memberDao.insertSelective(member); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
member.setId(snowflake.nextId()); |
|
|
|