修复 账户同步问题5

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

@@ -38,7 +38,6 @@ public class UsageLog extends BufferedLogable implements Serializable {
 	@JoinColumn(name = "log_useruu", insertable = false, updatable = false)
 	private UserBaseInfo user;
 
-	@NotNull
 	@Column(name = "log_useruu")
 	private Long userUU;
 

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

@@ -39,7 +39,11 @@ public class UserServiceImpl implements UserService {
         if (u == null && !StringUtils.isEmpty(user.getUid()) ){
             List<com.uas.platform.b2c.common.account.model.User> users = userDao.findUserByUserTel(user.getUid());
             if (!CollectionUtils.isEmpty(users)){
-                userDao.delete(users);
+                if (users.size() != 1 || !users.get(0).getUserUU().equals(user.getDialectUID())) {
+                    userDao.delete(users);
+                }else{
+                    u = users.get(0);
+                }
             }
         }
         if (null == u) {