B2C获取用户角色方法更新，调用已存在的方法

src/main/java/com/uas/platform/b2b/dao/UserDao.java

@@ -13,131 +13,127 @@ import org.springframework.stereotype.Repository;
 import javax.persistence.QueryHint;
 import java.util.List;
 
+/**
+ * 用户信息
+ */
 @Repository
 public interface UserDao extends JpaSpecificationExecutor<User>, JpaRepository<User, Long> {
 
+    /**
+     * 通过用户uu查询用户信息
+     *
+     * @param userUU 用户UU号
+     * @return List<User>
+     */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	public List<User> findUserByUserUU(Long userUU);
+    List<User> findUserByUserUU(Long userUU);
 
+    /**
+     * 通过邮箱查询用户信息
+     *
+     * @param userEmail 用户邮箱
+     * @return List<User>
+     */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	public List<User> findUserByUserEmail(String userEmail);
+    List<User> findUserByUserEmail(String userEmail);
 
+    /**
+     * 通过电话查询用户信息
+     *
+     * @param userTel 电话
+     * @return List<User>
+     */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	public List<User> findUserByUserTel(String userTel);
+    List<User> findUserByUserTel(String userTel);
 
 	/**
-	 * 按企业ID和个人ID查找个人
+	 * 按企业ID和个人名称查找个人
 	 * 
-	 * @param userName
-	 * @param enUU
-	 * @param userUU
-	 * @return
-	 */
+	 * @param userName 用户名称
+	 * @param enUU 企业UU
+	 * @return List<User>
+     */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	@Query("select u from User u inner join u.enterprises as e where e.uu = :enUU and u.userName like %:userName%")
-	public List<User> findUserByUserNameAndEnUU(@Param("userName") String userName,
-			@Param("enUU") Long enUU);
+    List<User> findUserByUserNameAndEnUU(@Param("userName") String userName, @Param("enUU") Long enUU);
 
 	/**
 	 * 按邮箱查询当前企业用户信息
 	 * 
-	 * @param userEmail
-	 * @param enUU
-	 * @return
+	 * @param userEmail 邮箱
+	 * @param enUU 企业UU
+	 * @return List<User>
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	@Query("select u from User u inner join u.enterprises as e where e.uu = :enUU and u.userEmail like %:userEmail%")
-	public List<User> findUserByUserEmailAndEnUU(@Param("userEmail") String userEmail, @Param("enUU") Long enUU);
+    List<User> findUserByUserEmailAndEnUU(@Param("userEmail") String userEmail, @Param("enUU") Long enUU);
 
 	/**
 	 * 按电话查询当前企业用户信息
 	 * 
-	 * @param userTel
-	 * @param enUU
-	 * @return
+	 * @param userTel 用户手机号
+	 * @param enUU 企业UU
+	 * @return List<User>
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	@Query("select u from User u inner join u.enterprises as e where e.uu = :enUU and u.userTel like %:userTel%")
-	public List<User> findUserByUserTelAndEnUU(@Param("userTel") String userTel, @Param("enUU") Long enUU);
+    List<User> findUserByUserTelAndEnUU(@Param("userTel") String userTel, @Param("enUU") Long enUU);
 
 	/**
 	 * 按企业ID和个人ID查找个人
 	 * 
-	 * @param enUU
-	 * @param userUU
-	 * @return
+	 * @param enUU 企业UU
+	 * @param userUU 用户UU
+	 * @return List<User>
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	@Query("select u from User u inner join u.enterprises as e where e.uu = :enUU and u.userUU = :userUU")
-	public List<User> findByEnUUAndUserUU(@Param("enUU") long enUU, @Param("userUU") long userUU);
+    List<User> findByEnUUAndUserUU(@Param("enUU") long enUU, @Param("userUU") long userUU);
 
 	/**
 	 * 按企业ID和查找个人
 	 * 
-	 * @param enUU
-	 * @return
+	 * @param enUU 企业UU
+	 * @return List<User>
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	@Query("select u from User u inner join u.enterprises as e where e.uu = :enUU")
-	public List<User> findByEnUU(@Param("enUU") long enUU);
+    List<User> findByEnUU(@Param("enUU") long enUU);
 
 	/**
 	 * 按角色ID查找该角色下的用户
 	 * 
-	 * @param roleId
-	 * @return
+	 * @param roleId 角色id
+	 * @return List<User>
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	@Query("select u from User u inner join u.roles as r where r.id = :roleId")
-	public List<User> findByRole(@Param("roleId") long roleId);
+    List<User> findByRole(@Param("roleId") long roleId);
 
 	/**
 	 *  分页查询用户信息
 	 *
-	 * @param page
-	 * @return
+     * @param enUU 企业UU
+	 * @param page 分页信息
+	 * @return Page<User>
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	@Query(value = "select u from User u inner join u.enterprises as e where e.uu = :enUU",
 			countQuery = "select count(1) from User u inner join u.enterprises as e where e.uu = :enUU")
 	Page<User> findEnUUByAndPage(@Param("enUU")Long enUU, Pageable page);
 
-
-	/**
-	 * 分页按名字查询当前企业的用户信息
-	 *
-	 * @param userName
-	 * @param enUU
-	 * @return
-	 */
-	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	@Query(value = "select u from User u inner join u.enterprises as e where e.uu = :enUU and u.userName like %:userName%",
-			countQuery = "select count(1) from User u inner join u.enterprises as e where e.uu = :enUU and u.userName like %:userName%")
-	public Page<User> findUserByUserNameAndEnUU(@Param("userName") String userName, @Param("enUU") Long enUU, Pageable page);
-
-	/**
-	 * 分页按邮箱查询当前企业用户信息
-	 *
-	 * @param userEmail
-	 * @param enUU
-	 * @return
-	 */
-	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	@Query(value = "select u from User u inner join u.enterprises as e where e.uu = :enUU and u.userEmail = :userEmail",
-			countQuery = "select count(1) from User u inner join u.enterprises as e where e.uu = :enUU and u.userEmail = :userEmail")
-	public Page<User> findUserByUserEmailAndEnUU(@Param("userEmail") String userEmail, @Param("enUU") Long enUU, Pageable page);
-
 	/**
 	 * 按企业ID和个人ID查找个人
 	 *
-	 * @param enUU
-	 * @param userUU
-	 * @return
+	 * @param enUU 企业UU
+	 * @param userUU 用户UU
+     * @param page  分页信息
+	 * @return Page<User>
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	@Query(value = "select u from User u inner join u.enterprises as e where e.uu = :enUU and u.userUU = :userUU",
 			countQuery = "select count(1) from User u inner join u.enterprises as e where e.uu = :enUU and u.userUU = :userUU")
-	public Page<User> findByEnUUAndUserUU(@Param("enUU") long enUU, @Param("userUU") long userUU, Pageable page);
+    Page<User> findByEnUUAndUserUU(@Param("enUU") long enUU, @Param("userUU") long userUU, Pageable page);
 
 	/**
 	 * 按企业ID和个人ID查找个人
@@ -146,14 +142,15 @@ public interface UserDao extends JpaSpecificationExecutor<User>, JpaRepository<U
 	 * @date 2018-01-16 17:09
 	 * @param enUU 企业UU
 	 * @param keyword 关键词
-	 * @return
+     * @param page 分页信息
+	 * @return Page<User>
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	@Query(value = "select u from User u inner join u.enterprises as e where e.uu = :enUU and " +
 			"(u.userName like %:keyword% or u.userTel like %:keyword% or u.userEmail like %:keyword%)",
 			countQuery = "select count(1) from User u inner join u.enterprises as e where e.uu = :enUU and " +
 					"(u.userName like %:keyword% or u.userTel like %:keyword% or u.userEmail like %:keyword%)")
-	public Page<User> findByEnUUAndKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword, Pageable page);
+    Page<User> findByEnUUAndKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword, Pageable page);
 
     /**
      * 按企业ID和个人ID查找个人
@@ -162,6 +159,8 @@ public interface UserDao extends JpaSpecificationExecutor<User>, JpaRepository<U
      * @date 2018-01-16 17:09
      * @param enUU 企业UU
      * @param keyword 关键词
+     * @param page 分页信息
+     * @param useruu 用户UU
      * @return
      */
     @QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
@@ -169,5 +168,5 @@ public interface UserDao extends JpaSpecificationExecutor<User>, JpaRepository<U
             "(u.userUU like :useruu or u.userName like %:keyword% or u.userTel like %:keyword% or u.userEmail like %:keyword%)",
             countQuery = "select count(1) from User u inner join u.enterprises as e where e.uu = :enUU and " +
                     "(u.userUU like :useruu or u.userName like %:keyword% or u.userTel like %:keyword% or u.userEmail like %:keyword%)")
-    public Page<User> findByEnUUAndKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword, @Param("useruu") Long useruu, Pageable page);
+    Page<User> findByEnUUAndKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword, @Param("useruu") Long useruu, Pageable page);
 }

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

@@ -3,18 +3,28 @@ package com.uas.platform.b2b.model;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Constant;
+import com.uas.sso.entity.UserView;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
 import org.springframework.util.CollectionUtils;
-
-import javax.persistence.*;
-
-import com.uas.sso.entity.UserView;
 import org.springframework.util.StringUtils;
-import java.io.Serializable;
+
+import javax.persistence.Cacheable;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.OrderBy;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.*;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
@@ -30,43 +40,65 @@ public class User implements Serializable {
 	 */
 	private static final long serialVersionUID = 1L;
 
+    /**
+     * 用户ID
+     */
 	@Id
 	@Column(name = "user_uu")
 	private Long userUU;
 
+    /**
+     * 用户姓名
+     */
 	@Column(name = "user_name", length = 50)
 	private String userName;
 
+    /**
+     * 用户密码
+     */
 	@Column(name = "user_pwd", length = 32)
 	private String userPwd;
 
+    /**
+     * 用户邮箱
+     */
 	@Column(name = "user_email", length = 50)
 	private String userEmail;
 
+    /**
+     * 用户电话
+     */
 	@Column(name = "user_tel", length = 30)
 	private String userTel;
 
+    /**
+     * 用户性别
+     */
 	@Column(name = "user_sex", length = 10)
 	private String userSex;
 
+    /**
+     * 用户证件号码
+     */
 	@Column(name = "user_idcode", length = 20)
 	private String userIdcode;
 
+    /**
+     * 是否有效
+     */
 	private Short enable;
 
+    /**
+     * 是否系统管理员
+     */
 	private Short issys;
 
+    /**
+     * UU端IMID
+     */
 	@Column(name = "user_imid")
 	private Long userIMId;
 
-	public Long getUserIMId() {
-		return userIMId;
-	}
-
-	public void setUserIMId(Long userIMId) {
-		this.userIMId = userIMId;
-	}
-
 	/**
 	 * 用户类型
 	 */
@@ -193,6 +225,14 @@ public class User implements Serializable {
 		this.userSex = userSex;
 	}
 
+    public Long getUserIMId() {
+        return userIMId;
+    }
+
+    public void setUserIMId(Long userIMId) {
+        this.userIMId = userIMId;
+    }
+
 	public Enterprise getEnterprise() {
 		return enterprise;
 	}
@@ -405,10 +445,10 @@ public class User implements Serializable {
 	public void setCurrentEnterpriseRoles() {
 		if(!CollectionUtils.isEmpty(this.roles) && this.enterprise != null) {
 			Iterator<Role> iterator = this.roles.iterator();
-			Long enuu = this.enterprise.getUu();
+			Long enUU = this.enterprise.getUu();
 			while (iterator.hasNext()) {
 				Role role = iterator.next();
-				if(!role.getEnUU().equals(enuu)) {
+				if(!role.getEnUU().equals(enUU)) {
 					iterator.remove();
 				}
 			}

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

@@ -2,18 +2,44 @@ package com.uas.platform.b2b.service.impl;
 
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.core.util.ThreadTask;
-import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.dao.DistributeDao;
+import com.uas.platform.b2b.dao.EnterpriseDao;
+import com.uas.platform.b2b.dao.PurcInquiryDao;
+import com.uas.platform.b2b.dao.PurcInquiryItemDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryInfoDao;
+import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
+import com.uas.platform.b2b.dao.RoleDao;
+import com.uas.platform.b2b.dao.UserDao;
+import com.uas.platform.b2b.dao.UserOrderDao;
+import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.event.PurchaseInquiryItemDecideReleaseEvent;
 import com.uas.platform.b2b.event.PurchaseInquiryItemSaveReleaseEvent;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.Attach;
+import com.uas.platform.b2b.model.Distribute;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.FileUpload;
 import com.uas.platform.b2b.model.ProductInfo;
+import com.uas.platform.b2b.model.PurcInquiry;
+import com.uas.platform.b2b.model.PurcInquiryItem;
+import com.uas.platform.b2b.model.PurchaseInquiry;
+import com.uas.platform.b2b.model.PurchaseInquiryInfo;
+import com.uas.platform.b2b.model.PurchaseInquiryItem;
+import com.uas.platform.b2b.model.PurchaseInquiryItemInfo;
+import com.uas.platform.b2b.model.PurchaseInquiryReply;
+import com.uas.platform.b2b.model.Role;
+import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.model.UserOrders;
+import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.ps.InquiryUtils;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.PurcInquiryService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
-import com.uas.platform.b2b.temporary.model.*;
+import com.uas.platform.b2b.temporary.model.InquiryDetailInfo;
+import com.uas.platform.b2b.temporary.model.InquiryProductInfo;
 import com.uas.platform.b2b.temporary.model.PurcInquiryInfo;
+import com.uas.platform.b2b.temporary.model.PurcInquiryProductInfo;
+import com.uas.platform.b2b.temporary.model.VendorAndContact;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
@@ -36,7 +62,12 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 采购询价
@@ -542,16 +573,18 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
             Map<String, InquiryProductInfo> productInfoMap = distinctProdCode(inquiry.getInquiryItems());
             Set<InquiryProductInfo> products = new HashSet<>();
             for (Map.Entry<String, InquiryProductInfo> map : productInfoMap.entrySet()) {
-                InquiryProductInfo productInfo = map.getValue();
-                Set<PurchaseInquiryItemInfo> items = new HashSet<>();
-                for (PurchaseInquiryItemInfo item : inquiry.getInquiryItems()) {
-                    if (item.getProductCode().equals(map.getKey())) {
-                        items.add(item);
+                if (null != map) {
+                    InquiryProductInfo productInfo = map.getValue();
+                    Set<PurchaseInquiryItemInfo> items = new HashSet<>();
+                    for (PurchaseInquiryItemInfo item : inquiry.getInquiryItems()) {
+                        if (null != map.getKey() && item.getProductCode().equals(map.getKey())) {
+                            items.add(item);
+                        }
                     }
+                    productInfo.setInquiryItems(items);
+                    products.add(productInfo);
+                    inquiryInfo.setProducts(products);
                 }
-                productInfo.setInquiryItems(items);
-                products.add(productInfo);
-                inquiryInfo.setProducts(products);
             }
         }
         return inquiryInfo;

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

@@ -1,7 +1,11 @@
 package com.uas.platform.b2b.service.impl;
 
 import com.uas.message.mail.service.MailService;
-import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.dao.DistributeDao;
+import com.uas.platform.b2b.dao.EnterpriseDao;
+import com.uas.platform.b2b.dao.RoleDao;
+import com.uas.platform.b2b.dao.UserDao;
+import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.model.Distribute;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.Role;
@@ -11,7 +15,6 @@ import com.uas.platform.b2b.model.UserInfo;
 import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.service.VendorService;
-import com.uas.platform.b2b.support.CommBufferedLogger;
 import com.uas.platform.b2b.support.MessageConf;
 import com.uas.platform.b2b.support.SPageUtils;
 import com.uas.platform.b2b.support.SendMailService;
@@ -73,8 +76,6 @@ public class UserServiceImpl implements UserService {
 	@Autowired
 	private EnterpriseDao enterpriseDao;
 	@Autowired
-	private CommonDao commonDao;
-	@Autowired
 	private MailService mailService;
 	@Autowired
 	private MessageConf messageConf;
@@ -84,20 +85,6 @@ public class UserServiceImpl implements UserService {
 	static final String UU_REGEXP = "^\\d{4,}$";
 
 	static final String NUM_REGEXP= "^[0-9]*$";
-	/**
-	 * 匹配中文正则式
-	 */
-	private static final String CHINESE_REGEXP = "^[\u4e00-\u9fa5]*$";
-
-	/**
-	 * 匹配英文正则式
-	 */
-	private static final String ENGLISH_REGEXP = "^[A-Za-z]+$";
-
-    /**
-     * 不需要展示的日志记录
-     */
-	private final static CommBufferedLogger logger = BufferedLoggerManager.getLogger(CommBufferedLogger.class);
 
     /**
      * 展示给用户查看的日志
@@ -156,12 +143,6 @@ public class UserServiceImpl implements UserService {
 		}
 	}
 
-	public boolean bindUser(String userUU, String enUU) {
-		// 打印SystemSession
-		// UserEnterprise实体？？？
-		return false;
-	}
-
 	@Override
 	public boolean isTelUseable(String tel) {
 		return userDao.findUserByUserTel(tel).size() == 0;
@@ -191,7 +172,6 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public User updateUserInfo(User user){
 		User newUser = userDao.findOne(user.getUserUU());
-		Long enuu = SystemSession.getUser().getEnterprise().getUu();
 		if (newUser != null) {
 			newUser.setUserName(user.getUserName());
 			newUser.setUserSex(user.getUserSex());
@@ -203,7 +183,8 @@ public class UserServiceImpl implements UserService {
 			// 修改用户角色，只对用户的当前企业的角色进行修改
 			if (!CollectionUtils.isEmpty(user.getRoles())) {
 				Set<Role> existRoles = newUser.getRoles();
-				if (!CollectionUtils.isEmpty(existRoles)) {// 保留用户在其他企业的角色
+				// 保留用户在其他企业的角色
+				if (!CollectionUtils.isEmpty(existRoles)) {
 					Iterator<Role> iterator = existRoles.iterator();
 					Long currentEnuu = SystemSession.getUser().getEnterprise().getUu();
 					while (iterator.hasNext()) {
@@ -261,7 +242,8 @@ public class UserServiceImpl implements UserService {
         StringBuffer newRoles = new StringBuffer();
 		if (!CollectionUtils.isEmpty(user.getRoles())) {
 			Set<Role> existRoles = newUser.getRoles();
-			if (existRoles != null) {// 保留用户在其他企业的角色
+			// 保留用户在其他企业的角色
+			if (existRoles != null) {
 				Iterator<Role> iterator = existRoles.iterator();
 				while (iterator.hasNext()) {
 					Role role = iterator.next();
@@ -286,7 +268,8 @@ public class UserServiceImpl implements UserService {
 			}
 		} else {
             Set<Role> existRoles = newUser.getRoles();
-            if (!CollectionUtils.isEmpty(existRoles)) {// 保留用户在其他企业的角色
+            // 保留用户在其他企业的角色
+            if (!CollectionUtils.isEmpty(existRoles)) {
                 Iterator<Role> iterator = existRoles.iterator();
                 while (iterator.hasNext()) {
                     Role role = iterator.next();
@@ -321,7 +304,6 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public SPage<User> findByPageInfo(PageInfo pageInfo, String keyword) {
 		Page<User> users = getUsersByPage(pageInfo, keyword);
-		SPage<User> userInfos = new SPage<User>();
 		if (!CollectionUtils.isEmpty(users.getContent())) {
 			for (User user : users.getContent()) {
 				Set<Role> roles = user.getRoles();
@@ -362,7 +344,6 @@ public class UserServiceImpl implements UserService {
 			if (user1.getEnterprise() == null) {
 				user1.setCurrentEnterprise();// 随便绑定一个用户所属企业
 			}
-			Enterprise enterprise = user1.getEnterprise();
 			user1 = userDao.save(user1);
 			return user1;
 		} else {
@@ -390,19 +371,7 @@ public class UserServiceImpl implements UserService {
     @Override
     public List<User> findByUserUUList(List<Long> userUUList) {
         List<User> users = userDao.findAll(userUUList);
-        users.forEach(user -> {
-            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();
-                    }
-                }
-            }
-        });
+        users.forEach(user -> user.setCurrentEnterpriseRoles());
         return users;
     }
 
@@ -521,7 +490,6 @@ public class UserServiceImpl implements UserService {
 		user.setUserPwd(Md5Utils.encode(defaultPassword, user.getUserUU()));
 		try {
 			user.setUserPwd(defaultPassword);
-//			postToAccountCenter(user, defaultPassword);
 			user = userDao.save(user);
 		} catch (Exception e) {
 			userDao.delete(user);
@@ -544,9 +512,11 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public User findShieldUuserInfo(String userName) {
 		User user = null;
-		if (userName.contains("@")) { // 邮箱登录
+		// 邮箱登录
+		if (userName.contains("@")) {
 			user = findUserByUserEmail(userName);
-		} else if (userName.matches(TEL_REGEXP)) {// 手机号登录
+			//手机号登录
+		} else if (userName.matches(TEL_REGEXP)) {
 			user = findUserByUserTel(userName);
 		} else if (userName.matches(UU_REGEXP)) {
 			user = findUserByUserUU(Long.parseLong(userName));
@@ -573,7 +543,8 @@ public class UserServiceImpl implements UserService {
 		model.put("uu", user.getUserUU());
 		model.put("checkcode", encodeString);
 		model.put("rootpath", AgentUtils.getHost(request));
-		if ("admin".equals(type)) {// 发送给管理员
+		// 发送给管理员
+		if ("admin".equals(type)) {
 			User admin = userDao.findOne(user.getEnterprise().getEnAdminuu());
 			// 发送邮件
 			model.put("email", admin.getUserEmail());
@@ -587,7 +558,7 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public String checkForget(Long userUU, String checkcode) {
-		String encodeString = null;
+		String encodeString;
 		if (tokenService.isCertified("user", userUU, checkcode)) {
 			encodeString = tokenService.getEncodeToken("user", userUU);
 		} else {
@@ -626,18 +597,21 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public UserInfo findUserByKeyWord(String keyWord) {
 		User user = null;
-		if (keyWord.contains("@")) { // 按邮箱查找
+		// 按邮箱查找
+		if (keyWord.contains("@")) {
 			user = findUserByUserEmail(keyWord);
-		} else if (keyWord.matches(TEL_REGEXP)) { // 按手机号查找
+			//按手机号查找
+		} else if (keyWord.matches(TEL_REGEXP)) {
 			user = findUserByUserTel(keyWord);
-		} else if (keyWord.matches(UU_REGEXP)) { // 按UU号查找
+			// 按UU号查找
+		} else if (keyWord.matches(UU_REGEXP)) {
 			user = findUserByUserUU(Long.parseLong(keyWord));
 		}
 		if (user == null) {
             throw new IllegalOperatorException("未查找到您输入账号的用户信息");
         }
-
-		UserInfo simpleUser = new UserInfo(user); // 将user重新封装为简单对象，只返回前台需要的用户信息
+        // 将user重新封装为简单对象，只返回前台需要的用户信息
+		UserInfo simpleUser = new UserInfo(user);
 		return simpleUser;
 	}
 
@@ -655,15 +629,6 @@ public class UserServiceImpl implements UserService {
 		List<User> users = new ArrayList<User>();
 		Set<User> userSet = new HashSet<User>();
 		Long enUU = SystemSession.getUser().getEnterprise().getUu();
-//		if (keyword.contains("@")) { // 按邮箱查找
-//			users = userDao.findUserByUserEmailAndEnUU(keyword, enUU);
-//		} else if (keyword.matches(TEL_REGEXP)) { // 按手机号查找
-//			users = userDao.findUserByUserTelAndEnUU(keyword, enUU);
-//		} else if (keyword.matches(UU_REGEXP)) { // 按UU号查找
-//			users = userDao.findByEnUUAndUserUU(enUU, Long.parseLong(keyword));
-//		} else if (!keyword.contains("@") && (keyword.matches(CHINESE_REGEXP) || keyword.matches(ENGLISH_REGEXP))) {// 按名字查找
-//			users = userDao.findUserByUserNameAndEnUU(keyword, enUU);
-//		}
 		userSet.addAll(userDao.findUserByUserEmailAndEnUU(keyword, enUU));
 		userSet.addAll(userDao.findUserByUserTelAndEnUU(keyword, enUU));
 		userSet.addAll(userDao.findByEnUUAndUserUU(enUU, Long.parseLong(keyword)));
@@ -916,7 +881,6 @@ public class UserServiceImpl implements UserService {
 					}
 				} else {
 					if (!CollectionUtils.isEmpty(butes)) {
-//						distributeDao.delete(butes.get(0));
 						List<Distribute> deleteList = new ArrayList<>();
 						// 删除时，同时删除其绑定权限的其他用户
 						List<Distribute> distributes = distributeDao.findByVendorIdAndLeaderUU(vendors.get(0).getId(), u.getUserUU());