注册新企业不能登录bug

src/main/java/com/uas/platform/b2b/model/Enterprise.java

@@ -30,8 +30,8 @@ public class Enterprise implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "enterprises_gen")
-	@SequenceGenerator(name = "enterprises_gen", sequenceName = "enterprises_seq", allocationSize = 1)
+//	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "enterprises_gen")
+//	@SequenceGenerator(name = "enterprises_gen", sequenceName = "enterprises_seq", allocationSize = 1)
 	@Column(name = "en_uu")
 	private Long uu;
 

src/main/java/com/uas/platform/b2b/v2/controller/EnterpriseController.java

@@ -38,20 +38,11 @@ public class EnterpriseController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public UserSpaceView save(UserSpaceView userSpaceDetail, UserView admin) throws Exception {
-		userSpaceDetail.setAdmin(admin);
-		if (userSpaceDetail != null) {
+		if (userSpaceDetail != null && admin != null) {
+			userSpaceDetail.setAdmin(admin);
 			Enterprise enterprise = enterpriseService.save(userSpaceDetail);
 			userSpaceDetail.setSpaceUU(enterprise.getUu());
 			// 为兼容以前模式，同时知会下管理系统。管理系统主要为了获取企业uu
-			try {
-//				String masterId = syncToManager(userSpaceDetail);
-				// 从管理系统保存完，dialectUID是管理系统masters.id
-//				enterprise.setEnMasterId(Long.parseLong(masterId));
-				enterpriseService.save(enterprise);
-			} catch (Exception e) {
-				e.printStackTrace();
-				throw e;
-			}
 		}
 		return null;
 	}

src/main/java/com/uas/platform/b2b/v2/service/impl/EnterpriseServiceImpl.java

@@ -38,11 +38,13 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 			isNew = true;
 		}
 
+		enterprise.setUu(detail.getSpaceUU());
 		enterprise.setEnAddress(detail.getRegAddress());
 		enterprise.setBusinesscodeimg(detail.getBusinessCodeImage());
 		enterprise.setEnAdminEmail(detail.getAdmin().getEmail());
 		enterprise.setEnAdminName(detail.getAdmin().getVipName());
 		enterprise.setEnAdminTel(detail.getAdmin().getMobile());
+		enterprise.setEnAdminuu(detail.getAdminUU() == null ? detail.getAdmin().getUserUU() : detail.getAdminUU());
 		enterprise.setEnArea(detail.getArea());
 		enterprise.setEnBussinessCode(detail.getBusinessCode());
 		enterprise.setEnCorporation(detail.getCorporation());
@@ -67,6 +69,11 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 //		enterprise.setContactEmail(detail.getAdmin().getEmail());
 		enterprise = enterpriseDao.save(enterprise);
 
+		// 把管理员添加进企业
+		User user = userDao.findOne(enterprise.getEnAdminuu());
+		user.addEnterprise(enterprise);
+		userDao.save(user);
+
 		if (isNew) {
 			final Long enUU = enterprise.getUu();
 			new Thread() {