|
@@ -95,21 +95,13 @@ public class MgrUserService {
|
|
|
mgrOrganization.setOrganizationCode("CZF" + Utils.random(8));
|
|
|
mgrOrganizationDao.insert(mgrOrganization);
|
|
|
|
|
|
- long userId = 0;
|
|
|
- MgrUser us = mgrUserDao.getByPhone(user.getPhone());
|
|
|
- if (us != null) {
|
|
|
- us.setLastOrganizationId(mgrOrganization.getId());
|
|
|
- mgrUserDao.updateLastOrganizationId(us);
|
|
|
- userId = us.getId();
|
|
|
- } else {
|
|
|
- mgrUserDao.insert(user);
|
|
|
- userId = user.getId();
|
|
|
- }
|
|
|
+ user.setLastOrganizationId(mgrOrganization.getId());
|
|
|
+ mgrUserDao.insert(user);
|
|
|
|
|
|
MgrUserRole userRole = new MgrUserRole();
|
|
|
userRole.setAdmin(true);
|
|
|
userRole.setOrganizationId(mgrOrganization.getId());
|
|
|
- userRole.setUserId(userId);
|
|
|
+ userRole.setUserId(user.getId());
|
|
|
mgrUserRoleDao.insert(userRole);
|
|
|
}
|
|
|
|