Merge remote-tracking branch 'origin/dev'

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

@@ -443,16 +443,35 @@ public class User implements Serializable {
 	 * 设置当前登录企业的角色
 	 */
 	public void setCurrentEnterpriseRoles() {
-		if(!CollectionUtils.isEmpty(this.roles) && this.enterprise != null) {
+		if (!CollectionUtils.isEmpty(this.roles) && this.enterprise != null) {
 			Iterator<Role> iterator = this.roles.iterator();
 			Long enUU = this.enterprise.getUu();
 			while (iterator.hasNext()) {
 				Role role = iterator.next();
-				if(!role.getEnUU().equals(enUU)) {
+				if (!role.getEnUU().equals(enUU)) {
 					iterator.remove();
 				}
 			}
 		}
 	}
 
+    /**
+     * 根据enUU判断用户在当前企业的UU号
+     * @param enUU 当前企业UU
+     */
+    public void setCurrentEnterpriseRoles(Long enUU) {
+        if (null != enUU) {
+            if (!CollectionUtils.isEmpty(this.roles)) {
+                Iterator<Role> iterator = this.roles.iterator();
+                while (iterator.hasNext()) {
+                    Role role = iterator.next();
+                    if (!role.getEnUU().equals(enUU)) {
+                        iterator.remove();
+                    }
+                }
+            }
+        } else {
+            this.roles = null;
+        }
+    }
 }

src/main/java/com/uas/platform/b2b/service/impl/UserServiceImpl.java

@@ -51,6 +51,7 @@ import java.util.Map;
 import java.util.Set;
 
 /**
+ * @author US50
  * @since 2016-9-26 21:18:35 账户中心统一管理；部分功能保留，但转移到v2目录
  * @see com.uas.platform.b2b.v2.service.impl.UserServiceImpl
  * 
@@ -304,19 +305,10 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public SPage<User> findByPageInfo(PageInfo pageInfo, String keyword) {
 		Page<User> users = getUsersByPage(pageInfo, keyword);
+		Long enUU = SystemSession.getUser().getEnterprise().getUu();
 		if (!CollectionUtils.isEmpty(users.getContent())) {
 			for (User user : users.getContent()) {
-				Set<Role> roles = user.getRoles();
-				Long enuu = SystemSession.getUser().getEnterprise().getUu();
-				if (!CollectionUtils.isEmpty(roles)) {
-					Iterator<Role> iterator = roles.iterator();
-					while (iterator.hasNext()) {
-						Role role = iterator.next();
-						if (!role.getEnUU().equals(enuu)) {
-							iterator.remove();
-						}
-					}
-				}
+			    user.setCurrentEnterpriseRoles(enUU);
 			}
 		}
 		return SPageUtils.covertSPage(users);
@@ -371,7 +363,8 @@ public class UserServiceImpl implements UserService {
     @Override
     public List<User> findByUserUUList(List<Long> userUUList) {
         List<User> users = userDao.findAll(userUUList);
-        users.forEach(user -> user.setCurrentEnterpriseRoles());
+        Long enUU = SystemSession.getUser().getEnterprise().getUu();
+        users.forEach(user -> user.setCurrentEnterpriseRoles(enUU));
         return users;
     }
 
@@ -635,17 +628,7 @@ public class UserServiceImpl implements UserService {
 		userSet.addAll(userDao.findUserByUserNameAndEnUU(keyword, enUU));
 		if (!CollectionUtils.isEmpty(userSet)) {
 			for (User user : users) {
-				Set<Role> roles = user.getRoles();
-				Long enuu = SystemSession.getUser().getEnterprise().getUu();
-				if (!CollectionUtils.isEmpty(roles)) {
-					Iterator<Role> iterator = roles.iterator();
-					while (iterator.hasNext()) {
-						Role role = iterator.next();
-						if (!role.getEnUU().equals(enuu)) {
-							iterator.remove();
-						}
-					}
-				}
+				user.setCurrentEnterpriseRoles(enUU);
 			}
 		}
 		return userSet;
@@ -681,7 +664,7 @@ public class UserServiceImpl implements UserService {
 		}
 		Set<Enterprise> enterprises = user.getEnterprises();
 		if (CollectionUtils.isEmpty(enterprises)) {
-			enterprises = new HashSet<Enterprise>();
+			enterprises = new HashSet<>();
 		}
 		enterprises.add(SystemSession.getUser().getEnterprise());
 		List<Role> roles = roleDao.findByEnUUAndDesc(SystemSession.getUser().getEnterprise().getUu(), "普通用户");
@@ -710,7 +693,7 @@ public class UserServiceImpl implements UserService {
 
 		Set<Enterprise> enterprises = user.getEnterprises();
 		if (CollectionUtils.isEmpty(enterprises)) {
-			enterprises = new HashSet<Enterprise>();
+			enterprises = new HashSet<>();
 		}
 		if (enter != null) {
 			enterprises.add(enter);