Merge branch 'master' of http://git.mokasz.com/marketing/moka-private

src/main/java/com/mokamrp/privates/controller/UserController.java

@@ -10,12 +10,9 @@ import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.service.UserCorpService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -29,7 +26,7 @@ import java.util.Map;
  * @author leon
  * @since 2021-04-17
  */
-@Controller
+@RestController
 @RequestMapping("/user")
 public class UserController extends BaseController<User>{
 
@@ -38,5 +35,6 @@ public class UserController extends BaseController<User>{
     public Object info(@AuthUser User authUser) {
         return AjaxResult.success(authUser);
     }
+
 }
 

src/main/java/com/mokamrp/privates/interceptor/AuthIntercepotor.java

@@ -7,6 +7,7 @@ import com.mokamrp.privates.cache.RedisCache;
 import com.mokamrp.privates.constant.RedisKey;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.mapper.pojo.User;
+import com.mokamrp.privates.service.UserService;
 import com.mokamrp.privates.utils.ServletUtils;
 import com.xxl.sso.core.conf.Conf;
 import com.xxl.sso.core.user.XxlSsoUser;
@@ -27,6 +28,9 @@ public class AuthIntercepotor extends HandlerInterceptorAdapter {
     public RedisCache redisCache;
 
     @Autowired
+    public UserService userService;
+
+    @Autowired
     private ObjectMapper objectMapper;
 
     @Override
@@ -60,6 +64,9 @@ public class AuthIntercepotor extends HandlerInterceptorAdapter {
         user.setIsSuperAdmin(1);
         request.setAttribute("auth-user", user);
 
+        userService.Insert(xxlSsoUser.getPlugininfo(),xxlSsoUser.getUsername());
+
         return true;
     }
+
 }

src/main/java/com/mokamrp/privates/mapper/UserMapper.java

@@ -2,6 +2,7 @@ package com.mokamrp.privates.mapper;
 
 import com.mokamrp.privates.mapper.pojo.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Component;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author leon
  * @since 2021-04-17
  */
+@Component
 public interface UserMapper extends BaseMapper<User> {
 
 }

src/main/java/com/mokamrp/privates/mapper/UserMapper.xml

@@ -21,12 +21,13 @@
         <result column="updated_at" property="updatedAt"/>
         <result column="deleted_at" property="deletedAt"/>
         <result column="is_super_admin" property="isSuperAdmin"/>
+        <result column="pic" property="pic"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id
-        , phone, password, name, gender, department, position, login_time, status, tenant_id, created_at, updated_at, deleted_at, is_super_admin
+        , phone, password, name, gender, department, position, login_time, status, tenant_id, created_at, updated_at, deleted_at, is_super_admin,pic
     </sql>
 
 </mapper>

src/main/java/com/mokamrp/privates/mapper/WorkContactEmployeeMapper.java

@@ -7,9 +7,11 @@ import com.mokamrp.privates.mapper.pojo.Corp;
 import com.mokamrp.privates.mapper.pojo.WorkContactEmployee;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo;
+import com.mokamrp.privates.mapper.vo.WorkRoomVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -23,8 +25,8 @@ import java.util.List;
 @Component
 public interface WorkContactEmployeeMapper extends BaseMapper<WorkContactEmployee> {
 
-    List<WorkContactEmployeeVo> getVoList(Page<WorkContactEmployeeVo> page, @Param("ew") QueryWrapper<WorkContactEmployee> queryWrapper);
-    List<WorkContactEmployeeVo> getAllVoList(@Param("ew") QueryWrapper<WorkContactEmployee> queryWrapper);
-    Integer getVoListTotal(@Param("ew") QueryWrapper<WorkContactEmployee> queryWrapper);
-
+    List<WorkContactEmployeeVo> getVoList(Page<WorkContactEmployeeVo> page, @Param("ew") QueryWrapper<WorkContactEmployeeVo> queryWrapper);
+    List<WorkContactEmployeeVo> getAllVoList(@Param("ew") QueryWrapper<WorkContactEmployeeVo> queryWrapper);
+    Integer getVoListTotal(@Param("ew") QueryWrapper<WorkContactEmployeeVo> queryWrapper);
+    List<HashMap<String, Object>> getContactTagList(@Param("ew") QueryWrapper<WorkContactEmployeeVo> queryWrapper);
 }

src/main/java/com/mokamrp/privates/mapper/WorkContactEmployeeMapper.xml

@@ -31,6 +31,7 @@
     <select id="getVoList" resultType="com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo">
         SELECT a.id,
                c.`name`          AS client_name,
+               a.`employee_id`   AS employee_id,
                c.gender          AS client_gender,
                a.`status`        AS client_status,
                a.channel_code_id as channel_code_id,
@@ -40,47 +41,50 @@
                e.`name`          AS employee_name,
                p.`name`          as company_name,
                l.`name`          as channel_code_name,
+               a.contact_id,
                a.state,
-               a.remark
+               a.remark,
+               h.group_name,
+			   g.group_id
         FROM mc_work_contact_employee AS a
                  LEFT JOIN mc_work_employee AS e ON a.employee_id = e.id
                  LEFT JOIN mc_work_contact AS c ON a.contact_id = c.id
                  LEFT JOIN mc_corp AS p ON p.id = a.corp_id
                  LEFT JOIN mc_channel_code AS l ON l.id = a.channel_code_id
+                 LEFT JOIN private_group_corp AS g ON a.id = g.corp_id
+				 LEFT JOIN private_group AS h ON h.id = g.group_id
+				 LEFT JOIN mc_work_contact_tag_pivot AS k ON a.contact_id = a.contact_id
         where 1 = 1 AND ${ew.sqlSegment}
+        group by a.id
     </select>
 
-
     <select id="getVoListTotal" resultType="Integer">
-        SELECT count(*)
+        SELECT
+            count(distinct (a.id))
         FROM mc_work_contact_employee AS a
-                 LEFT JOIN mc_work_employee AS e ON a.employee_id = e.id
-                 LEFT JOIN mc_work_contact AS c ON a.contact_id = c.id
-                 LEFT JOIN mc_corp AS p ON p.id = a.corp_id
-                 LEFT JOIN mc_channel_code AS l ON l.id = a.channel_code_id
+             LEFT JOIN mc_work_employee AS e ON a.employee_id = e.id
+             LEFT JOIN mc_work_contact AS c ON a.contact_id = c.id
+             LEFT JOIN mc_corp AS p ON p.id = a.corp_id
+             LEFT JOIN mc_channel_code AS l ON l.id = a.channel_code_id
+             LEFT JOIN private_group_corp AS g ON a.id = g.corp_id
+             LEFT JOIN mc_work_contact_tag_pivot AS k ON a.contact_id = a.contact_id
         where 1 = 1 AND ${ew.sqlSegment}
     </select>
 
-    <select id="getAllVoList" resultType="com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo">
-        SELECT a.id,
-               c.`name`          AS client_name,
-               c.gender          AS client_gender,
-               a.`status`        AS client_status,
-               a.channel_code_id as channel_code_id,
-               c.deleted_at      AS client_deleted_at,
-               c.created_at      AS client_created_at,
-               c.unionid         AS client_unionid,
-               e.`name`          AS employee_name,
-               p.`name`          as company_name,
-               l.`name`          as channel_code_name,
-               a.state,
-               a.remark
-        FROM mc_work_contact_employee AS a
-                 LEFT JOIN mc_work_employee AS e ON a.employee_id = e.id
-                 LEFT JOIN mc_work_contact AS c ON a.contact_id = c.id
-                 LEFT JOIN mc_corp AS p ON p.id = a.corp_id
-                 LEFT JOIN mc_channel_code AS l ON l.id = a.channel_code_id
-        where 1 = 1 AND ${ew.sqlSegment}
+    <select id="getContactTagList" resultType="Map">
+        SELECT
+            a.id,
+            a.contact_id,
+            a.contact_tag_id,
+            a.employee_id,
+            GROUP_CONCAT( DISTINCT b.`name` ) AS tag_names,
+            GROUP_CONCAT( DISTINCT a.contact_tag_id ) AS tag_ids
+        FROM
+            mc_work_contact_tag_pivot AS a
+        LEFT JOIN mc_work_contact_tag AS b ON a.contact_tag_id = b.id
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        GROUP BY a.contact_id,a.employee_id;
     </select>
-
 </mapper>

src/main/java/com/mokamrp/privates/mapper/WorkRoomMapper.java

@@ -8,11 +8,15 @@ import com.mokamrp.privates.mapper.pojo.WorkContactEmployee;
 import com.mokamrp.privates.mapper.pojo.WorkRoom;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo;
+import com.mokamrp.privates.mapper.vo.WorkGroupDataVo;
 import com.mokamrp.privates.mapper.vo.WorkRoomVo;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -27,4 +31,6 @@ public interface WorkRoomMapper extends BaseMapper<WorkRoom> {
     List<WorkRoomVo> getVoList(IPage<WorkRoomVo> page, @Param("ew") QueryWrapper<WorkRoomVo> queryWrapper);
 
     Integer getVoListTotal(@Param("ew") QueryWrapper<WorkRoomVo> queryWrapper);
+
+    List<HashMap<String, Object>> getRoomTagList(@Param("ew") QueryWrapper<WorkRoomVo> queryWrapper);
 }

src/main/java/com/mokamrp/privates/mapper/WorkRoomMapper.xml

@@ -65,5 +65,19 @@
         </where>
     </select>
 
+    <select id="getRoomTagList" resultType="Map">
+        SELECT
+        a.id,
+        GROUP_CONCAT(g.tag_name) as tag_names,
+        GROUP_CONCAT(g.id) as tag_ids
+        FROM
+            mc_work_room AS a
+        LEFT JOIN private_room_tag AS f ON a.id = f.room_id
+        LEFT JOIN private_tag AS g ON g.id = f.tag_id
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        group by a.id;
+    </select>
 
 </mapper>

src/main/java/com/mokamrp/privates/mapper/pojo/User.java

@@ -24,7 +24,6 @@ public class User extends Model<User> {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
     /**
      * 手机号
@@ -65,6 +64,7 @@ public class User extends Model<User> {
     private Date createdAt;
     private Date updatedAt;
     private Date deletedAt;
+    private String Pic;
     /**
      * 是否为超级管理员 - 0否1是
      */
@@ -78,6 +78,14 @@ public class User extends Model<User> {
         this.id = id;
     }
 
+    public String getPic() {
+        return Pic;
+    }
+
+    public void setPic(String pic) {
+        Pic = pic;
+    }
+
     public String getPhone() {
         return phone;
     }

src/main/java/com/mokamrp/privates/mapper/vo/WorkContactEmployeeVo.java

@@ -26,6 +26,60 @@ public class WorkContactEmployeeVo {
     private String channelCodeName;
     private String tate;
     private String remark;
+    private String groupName;
+    private String groupId;
+    private Integer contactId;
+    private String tagNames;
+    private String tagIds;
+    private Integer employeeId;
+
+    public Integer getEmployeeId() {
+        return employeeId;
+    }
+
+    public void setEmployeeId(Integer employeeId) {
+        this.employeeId = employeeId;
+    }
+
+    public String getTagNames() {
+        return tagNames;
+    }
+
+    public void setTagNames(String tagNames) {
+        this.tagNames = tagNames;
+    }
+
+    public String getTagIds() {
+        return tagIds;
+    }
+
+    public void setTagIds(String tagIds) {
+        this.tagIds = tagIds;
+    }
+
+    public Integer getContactId() {
+        return contactId;
+    }
+
+    public void setContactId(Integer contactId) {
+        this.contactId = contactId;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
 
     public String getClientName() {
         return clientName;

src/main/java/com/mokamrp/privates/mapper/vo/WorkRoomVo.java

@@ -30,6 +30,15 @@ public class WorkRoomVo {
     private Integer leftNum;
     private String tagNames;
     private String groupName;
+    private String tagIdsStr;
+
+    public String getTagIdsStr() {
+        return tagIdsStr;
+    }
+
+    public void setTagIdsStr(String tagIdsStr) {
+        this.tagIdsStr = tagIdsStr;
+    }
 
     public String getGroupName() {
         return groupName;

src/main/java/com/mokamrp/privates/service/UserService.java

@@ -15,6 +15,6 @@ import java.util.Map;
  * @since 2021-04-17
  */
 public interface UserService extends IService<User> {
-
     public Map<String, Object> doLogin(String phone, String password);
+    public void Insert(Map<String,String> info,String name);
 }

src/main/java/com/mokamrp/privates/service/impl/GroupServiceImpl.java

@@ -43,8 +43,8 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
         Map<String, Object> resMap = new HashMap<String, Object>();
         resMap.put("list", null);
 
-        list = groupMapper.getBaseJoinList(pageObj);
         total = groupMapper.getBaseJoinListTotal();
+        list = groupMapper.getBaseJoinList(pageObj);
         int len = list.size();
         if (len > 0) {
             List<Integer> ids = list.stream().map(WorkGroupDataVo -> WorkGroupDataVo.getId()).collect(Collectors.toList());

src/main/java/com/mokamrp/privates/service/impl/UserServiceImpl.java

@@ -6,6 +6,7 @@ import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.constant.RedisKey;
 import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.mapper.UserMapper;
+import com.mokamrp.privates.mapper.vo.WorkRoomVo;
 import com.mokamrp.privates.service.UserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.utils.StringUtils;
@@ -14,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -30,6 +33,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Autowired
     public StringRedisTemplate redis;
 
+    @Autowired
+    public UserMapper userMapper;
+
     public Map<String, Object> doLogin(String phone, String password) {
         Map<String, Object> res =this.getMap(new QueryWrapper<User>().eq("phone", phone));
         //.验证账户名和密码
@@ -53,4 +59,29 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         res.put("loginStatus", "loginSuccess");
         return res;
     }
+
+    public void Insert(Map<String,String> info,String name) {
+
+        User user = new User();
+
+        if(info.get("employeeNo").isEmpty()){
+            return;
+        }
+
+
+        if(userMapper.selectById(info.get("employeeNo")) != null){
+            return;
+        }
+
+        user.setId(Integer.parseInt(info.get("employeeNo").toString()));
+        user.setGender(Integer.parseInt(info.get("gender").toString()));
+        user.setPhone(info.get("tel").toString().replaceAll("/+86",""));
+        user.setPic(info.get("pic").toString());
+        user.setLoginTime(new Date());
+
+        user.setName(name);
+        this.saveOrUpdate(user);
+
+        return;
+    }
 }

src/main/java/com/mokamrp/privates/service/impl/WorkContactEmployeeServiceImpl.java

@@ -12,6 +12,7 @@ import com.mokamrp.privates.mapper.pojo.Downfile;
 import com.mokamrp.privates.mapper.pojo.WorkContactEmployee;
 import com.mokamrp.privates.mapper.WorkContactEmployeeMapper;
 import com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo;
+import com.mokamrp.privates.mapper.vo.WorkRoomVo;
 import com.mokamrp.privates.service.WorkContactEmployeeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.utils.OssFile;
@@ -24,6 +25,7 @@ import org.springframework.stereotype.Service;
 import java.io.ByteArrayInputStream;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -54,10 +56,8 @@ public class WorkContactEmployeeServiceImpl extends ServiceImpl<WorkContactEmplo
     public Map<String, Object> getPageList(GetWorkContactEmployeeHandle handle) {
 
         Page<WorkContactEmployeeVo> pageObj = new Page<>(handle.getPage(), handle.getPagesize());
-        QueryWrapper<WorkContactEmployee> obj = getWrapper(handle);
-
-
-        List<WorkContactEmployeeVo> list = mapperObj.getVoList(pageObj, obj);
+        QueryWrapper<WorkContactEmployeeVo> obj = getWrapper(handle);
+        List<WorkContactEmployeeVo> list = getCommonList(pageObj, obj);
 
         Integer total = mapperObj.getVoListTotal(obj);
 
@@ -73,8 +73,10 @@ public class WorkContactEmployeeServiceImpl extends ServiceImpl<WorkContactEmplo
     public void export(Downfile downFile, GetWorkContactEmployeeHandle handle) {
 
         List<Object> tempObj;
-        QueryWrapper<WorkContactEmployee> obj = getWrapper(handle);
-        List<WorkContactEmployeeVo> list = mapperObj.getAllVoList(obj);
+        QueryWrapper<WorkContactEmployeeVo> obj = getWrapper(handle);
+        Integer total = mapperObj.getVoListTotal(obj);
+        Page<WorkContactEmployeeVo> pageObj = new Page<>(1, total);
+        List<WorkContactEmployeeVo> list = getCommonList(pageObj, obj);
 
         //实现下载
         List<List<Object>> resList = new ArrayList<List<Object>>();
@@ -120,9 +122,35 @@ public class WorkContactEmployeeServiceImpl extends ServiceImpl<WorkContactEmplo
         return;
     }
 
-    private QueryWrapper<WorkContactEmployee> getWrapper(GetWorkContactEmployeeHandle handle) {
+    private List<WorkContactEmployeeVo> getCommonList(Page<WorkContactEmployeeVo> pageObj, QueryWrapper<WorkContactEmployeeVo> obj) {
+        List<WorkContactEmployeeVo> list = mapperObj.getVoList(pageObj, obj);
+
+        if (list.size() > 0) {
+            List<Integer> ids = list.stream().map(WorkContactEmployeeVo::getContactId).collect(Collectors.toList());
+            QueryWrapper<WorkContactEmployeeVo> tagObj = new QueryWrapper<WorkContactEmployeeVo>();
+            tagObj.in("a.contact_id", ids);
+            List<HashMap<String, Object>> tagMapData = mapperObj.getContactTagList(tagObj);
+            int j = list.size();
+
+            for (int i = 0; i < j; i++) {
+                list.get(i).setTagNames("");
+                list.get(i).setTagIds("");
+                for (Map<String, Object> tag : tagMapData) {
+                    if (tag.get("employee_id").toString().equals(list.get(i).getEmployeeId().toString())
+                            && tag.get("contact_id").toString().equals(list.get(i).getContactId().toString()) ) {
+                        list.get(i).setTagNames(tag.get("tag_names").toString());
+                        list.get(i).setTagIds(tag.get("tag_ids").toString());
+                    }
+                }
+            }
+        }
+
+        return list;
+    }
+
+    private QueryWrapper<WorkContactEmployeeVo> getWrapper(GetWorkContactEmployeeHandle handle) {
 
-        QueryWrapper<WorkContactEmployee> obj = new QueryWrapper<WorkContactEmployee>();
+        QueryWrapper<WorkContactEmployeeVo> obj = new QueryWrapper<WorkContactEmployeeVo>();
 
         Integer gender = handle.getGender();
         Integer status = handle.getStatus();
@@ -173,10 +201,18 @@ public class WorkContactEmployeeServiceImpl extends ServiceImpl<WorkContactEmplo
             obj.eq("a.corp_id", corpId);
         }
 
-        if (employeeId != null && employeeId.size() >=1) {
+        if (employeeId != null && employeeId.size() >= 1) {
             obj.in("a.employee_id", employeeId);
         }
 
+        if (tagId != null && tagId.size() >= 1) {
+            obj.in("k.contact_tag_id", tagId);
+        }
+
+        if (group_id != null) {
+            obj.eq("g.group_id", group_id);
+        }
+
         obj.in("a.corp_id", authCorpIds);
 
         return obj;

src/main/java/com/mokamrp/privates/service/impl/WorkRoomServiceImpl.java

@@ -145,25 +145,48 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
 
         List<WorkRoomVo> list = mapperObj.getVoList(pageObj, room);
 
-        System.out.println("获取数量是"+list.size());
-
         if (list.size() > 0) {
             List<Integer> ids = list.stream().map(WorkRoomVo -> WorkRoomVo.getId()).collect(Collectors.toList());
             HashMap<Integer, HashMap<String, Integer>> dataById = getDataById(ids);
 
+            QueryWrapper<WorkRoomVo> tagObj = new QueryWrapper<WorkRoomVo>();
+            tagObj.in("a.id", ids);
+            List<HashMap<String, Object>> tagMapData = mapperObj.getRoomTagList(tagObj);
+            System.out.println(tagMapData);
+
             if (dataById.size() > 0) {
+                int j  = list.size();
+                //for (int i=0;i<j;i++)
                 list = list.stream().map(WorkRwoomVo -> {
                     WorkRoomVo detail = new WorkRoomVo();
                     BeanUtils.copyProperties(WorkRwoomVo, detail);
                     detail.setTotalNum(0);
                     detail.setAddNum(0);
                     detail.setLeftNum(0);
+                    detail.setTagNames("");
+                    detail.setTagIdsStr("");
                     if (dataById.get(detail.getId()) != null) {
                         detail.setTotalNum((dataById.get(detail.getId()).get("total")));
                         detail.setAddNum(dataById.get(detail.getId()).get("add_num"));
                         detail.setLeftNum(dataById.get(detail.getId()).get("left_num"));
                     }
 
+                    System.out.println(tagMapData);
+
+                    for (HashMap<String,Object> m :tagMapData){
+                        System.out.println(m);
+                        if(m.get("id").toString().equals(detail.getId().toString())){
+                            if(m.get("tag_names") != null){
+                                detail.setTagNames(m.get("tag_names").toString());
+                            }
+
+                            if(m.get("tag_ids") != null){
+                                detail.setTagIdsStr(m.get("tag_ids").toString());
+                            }
+                        }
+                    }
+
+
                     return detail;
                 }).collect(Collectors.toList());
             }
@@ -321,6 +344,8 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         QueryWrapper<WorkContactRoom> contactRoomQueryWrapperTotal = new QueryWrapper<WorkContactRoom>();
         QueryWrapper<WorkContactRoom> contactRoomQueryWrapperTodayAdd = new QueryWrapper<WorkContactRoom>();
         QueryWrapper<WorkContactRoom> contactRoomQueryWrapperTodayLeft = new QueryWrapper<WorkContactRoom>();
+
+
         contactRoomQueryWrapperTotal.in("room_id", ids);
         contactRoomQueryWrapperTotal.eq("status", 1);
 
@@ -329,7 +354,6 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         contactRoomQueryWrapperTodayAdd.le("join_time", todayEndDate);
         contactRoomQueryWrapperTodayAdd.ge("join_time", todayStartDate);//大于
 
-
         contactRoomQueryWrapperTodayLeft.in("room_id", ids);
         contactRoomQueryWrapperTodayLeft.eq("status", 2);
         contactRoomQueryWrapperTodayLeft.le("out_time", todayEndDate);
@@ -339,7 +363,6 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         List<WorkContactRoomGroupDataVo> todayAdds = contanctMapperObj.getNum(contactRoomQueryWrapperTodayAdd);
         List<WorkContactRoomGroupDataVo> totals = contanctMapperObj.getNum(contactRoomQueryWrapperTotal);
 
-
         HashMap<Integer, HashMap<String, Integer>> dataById =
                 new HashMap<Integer, HashMap<String, Integer>>();
 
@@ -379,6 +402,7 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
                 dataById.put(o.getRoom_id(), tempSetAdd);
             }
         }
+
         return dataById;
 
     }