修复 账户同步问题

src/main/java/com/uas/platform/b2c/common/account/model/User.java

@@ -63,7 +63,6 @@ public class User implements Serializable {
 	 * 邮箱
 	 */
 	@Column(name = "user_email", length = 50)
-	@NotNull
 	private String userEmail;
 
 	/**

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -31,17 +31,34 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public void save(User user) {
-        com.uas.platform.b2c.common.account.model.User u = userDao.findOne(Long.parseLong(user.getDialectUID()));
-        if (null == u) {
-            u = new com.uas.platform.b2c.common.account.model.User();
+        if (null == user.getDialectUID() || "".equals(user.getDialectUID())){
+            List<com.uas.platform.b2c.common.account.model.User> users = userDao.findUserByUserTel(user.getUid());
+            if (!CollectionUtils.isEmpty(users)){
+                for (com.uas.platform.b2c.common.account.model.User u:users){
+                    oneSave(user,u);
+                }
+            }
+        }else {
+            com.uas.platform.b2c.common.account.model.User u = userDao.findOne(Long.parseLong(user.getDialectUID()));
+            if (null == u) {
+                u = new com.uas.platform.b2c.common.account.model.User();
+                oneSave(user,u);
+            }
         }
+
+    }
+    private void oneSave(User user , com.uas.platform.b2c.common.account.model.User u){
         u.setUserPwd(user.getPassword());
         u.setUserName(user.getName());
         u.setUserTel(user.getUid());
         u.setEnable((short) 1);
         u.setUserEmail(user.getSecondUID());
         u.setUserUU(Long.valueOf(user.getDialectUID()));
-        Enterprise enterprise = enterpriseDao.findByUu(Long.valueOf(user.getSpaceDialectUID()));
+
+        Enterprise enterprise = null;
+        if(user.getSpaceDialectUID()!=null){
+            enterprise = enterpriseDao.findByUu(Long.valueOf(user.getSpaceDialectUID()));
+        }
         if (null != enterprise) {
             u.setEnterprise(enterprise);
             if (null == enterprise.getEnAdminuu()) {
@@ -50,7 +67,6 @@ public class UserServiceImpl implements UserService {
                 logger.log("设置管理员", enterprise.getEnName() + ":" + enterprise.getUu() + ";" + u.getUserName() + ":" + u.getUserUU());
             }
         }
-
         boolean isMember = false;
         //将该成员添加至企业
         Set<Enterprise> ens = u.getEnterprises();
@@ -62,7 +78,6 @@ public class UserServiceImpl implements UserService {
                 }
             }
         }
-
         if (!isMember) {
             Set<Enterprise> enterprises = null;
             if (null == u.getEnterprises()) {
@@ -79,11 +94,10 @@ public class UserServiceImpl implements UserService {
         List<com.uas.platform.b2c.common.account.model.User> oldUsers = userDao.findUserByUserUU(u.getUserUU());
         userDao.save(u);
         if (oldUsers.size() > 0) {
-            logger.log("更新用户信息", user.getDialectUID() + "" + enterprise.getUu());
+            logger.log("更新用户信息", user.getDialectUID() + "" + (enterprise==null?"":enterprise.getUu()));
         } else {
-            logger.log("新增用户信息", user.getDialectUID() + ", " + enterprise.getUu());
+            logger.log("新增用户信息", user.getDialectUID() + ", " + (enterprise==null?"":enterprise.getUu()) );
         }
-
     }
 
     @Override