账户 同步接口bug1

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

@@ -18,10 +18,10 @@ import java.util.*;
 @Service("v2.UserService")
 public class UserServiceImpl implements UserService {
 
-	@Autowired
-	private UserDao userDao;
+    @Autowired
+    private UserDao userDao;
 
-	@Autowired
+    @Autowired
     private EnterpriseDao enterpriseDao;
 
     private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
@@ -32,7 +32,7 @@ public class UserServiceImpl implements UserService {
     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();
+            u = new com.uas.platform.b2c.common.account.model.User();
         }
         u.setUserPwd(user.getPassword());
         u.setUserName(user.getName());
@@ -41,31 +41,32 @@ public class UserServiceImpl implements UserService {
         u.setUserEmail(user.getSecondUID());
         u.setUserUU(Long.valueOf(user.getDialectUID()));
         Enterprise enterprise = enterpriseDao.findByUu(Long.valueOf(user.getSpaceDialectUID()));
-        if(null != enterprise) {
+        if (null != enterprise) {
             u.setEnterprise(enterprise);
-            if(null == enterprise.getEnAdminuu()) {
+            if (null == enterprise.getEnAdminuu()) {
                 enterprise.setEnAdminuu(u.getUserUU());
                 enterpriseDao.save(enterprise);
                 logger.log("设置管理员", enterprise.getEnName() + ":" + enterprise.getUu() + ";" + u.getUserName() + ":" + u.getUserUU());
             }
+        }
 
         //将该成员添加至企业
         Set<Enterprise> ens = u.getEnterprises();
         Iterator<Enterprise> it = ens.iterator();
         boolean isMember = false;
-        while (it.hasNext()){
-            if (it.next().getUu() == enterprise.getUu()){
+        while (it.hasNext()) {
+            if (it.next().getUu() == enterprise.getUu()) {
                 isMember = true;
             }
         }
-        if (!isMember){
+        if (!isMember) {
             Set<Enterprise> enterprises = null;
-            if (null == u.getEnterprises()){
+            if (null == u.getEnterprises()) {
                 enterprises = new HashSet<Enterprise>();
-            }else{
+            } else {
                 enterprises = u.getEnterprises();
             }
-            if(null != enterprise) {
+            if (null != enterprise) {
                 u.setEnterprise(enterprise);
                 enterprises.add(enterprise);
             }
@@ -73,19 +74,19 @@ 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) {
+        if (oldUsers.size() > 0) {
             logger.log("更新用户信息", user.getDialectUID() + "" + enterprise.getUu());
         } else {
             logger.log("新增用户信息", user.getDialectUID() + ", " + enterprise.getUu());
         }
-    }
 
+    }
 
     @Override
     public void delete(Long uu, Long enuu) {
         com.uas.platform.b2c.common.account.model.User user = userDao.findOne(uu);
         Enterprise enterprise = enterpriseDao.findByUu(enuu);
-        if(null != user && null != enterprise) {
+        if (null != user && null != enterprise) {
             if (user.getEnterprises().contains(enterprise)) {
                 user.removeEnterprise(enterprise);
                 if (user.getEnterprises().size() != 0) {