Merge branch 'master-tiande' into dev-tiande

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/BaseUserVo.java

 package com.github.wxiaoqi.security.admin.vo;
 
+import com.github.wxiaoqi.security.admin.entity.Group;
 import com.github.wxiaoqi.security.admin.entity.User;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -8,6 +9,8 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Table;
 import java.io.Serializable;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author libin
@@ -22,4 +25,15 @@ import java.io.Serializable;
 public class BaseUserVo extends User {
     private String companyName;
     private String corporationName;
+
+    private List<Group> groupList;
+    private String groupStr;
+
+
+    public  String getGroupStr(){
+        if (groupList != null && groupList.size() > 0){
+            groupStr= groupList.stream().map(Group::getName).collect(Collectors.joining(","));
+        }
+        return  groupStr;
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserBiz.java

@@ -52,6 +52,9 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
     @Autowired
     private VehicleFeign vehicleFeign;
 
+    @Autowired
+    private  GroupBiz groupBiz;
+
     @Override
     public void insertSelective(User entity) {
         String password = new BCryptPasswordEncoder(UserConstant.PW_ENCORDER_SALT).encode(entity.getPassword());
@@ -160,6 +163,7 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
                 if (companySearchVO != null ){
                     userVo.setCompanyName(companySearchVO.getName());
                 }
+                userVo.setGroupList(groupBiz.getUserGroups(userVo.getId()));
                 userVos.add(userVo);
             }
         }