|
|
@@ -82,19 +82,12 @@ public class EnterpriseServiceImpl implements EnterpriseService {
|
|
|
enterprise.setEnLogoUrl(userSpaceView.getBusinessCodeImage());
|
|
|
enterprise.setUu(Long.valueOf(userSpaceView.getSpaceUU()));
|
|
|
//Long userUU = admins.get(0).getUserUU();
|
|
|
- enterprise.setEnAdminuu(userSpaceView.getAdminUU());
|
|
|
+ if (userSpaceView.getAdminUU() != null) {
|
|
|
+ enterprise.setEnAdminuu(userSpaceView.getAdminUU());
|
|
|
+ }
|
|
|
enterprise.setEnValidCode(userSpaceView.getValidCode());
|
|
|
Enterprise newEn = enterpriseDao.save(enterprise);
|
|
|
-
|
|
|
- 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);
|
|
|
- }
|
|
|
- }
|
|
|
+ User adminUser = userDao.findOne(newEn.getEnAdminuu());
|
|
|
// 保存新注册企业与用户的关联关系
|
|
|
if (adminUser != null) {
|
|
|
adminUser.addEnterprise(newEn);
|