|
|
@@ -66,7 +66,17 @@ public class EnterpriseServiceImpl implements EnterpriseService {
|
|
|
enterprise.setEnAdminuu(userSpaceView.getAdminUU());
|
|
|
Enterprise newEn = enterpriseDao.save(enterprise);
|
|
|
|
|
|
- User adminUser = userDao.findOne(newEn.getEnAdminuu());
|
|
|
+ User adminUser = null;
|
|
|
+ if (null == userSpaceView.getAdminUU()) {
|
|
|
+ adminUser = userDao.findOne(newEn.getEnAdminuu());
|
|
|
+ } else {
|
|
|
+ List<User> users = userDao.findUserByUserTel(userSpaceView.getTelephone());
|
|
|
+ if (CollectionUtils.isNotEmpty(users)) {
|
|
|
+ adminUser = users.get(0);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ // 保存新注册企业与用户的关联关系
|
|
|
if (adminUser != null) {
|
|
|
adminUser.addEnterprise(newEn);
|
|
|
userDao.save(adminUser);
|