fix(分组数量错误，客服搜索确实)

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

@@ -51,7 +51,7 @@
                  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_corp AS g ON a.corp_id = g.corp_id
 				 LEFT JOIN private_group AS h ON h.id = g.group_id
         where 1 = 1 AND ${ew.sqlSegment}
         LIMIT #{limit} offset #{offset}
@@ -65,7 +65,7 @@
              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_corp AS g ON a.corp_id = g.corp_id
         where 1 = 1 AND ${ew.sqlSegment}
     </select>
 

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

@@ -60,10 +60,10 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
             /**获取标签下客服数据**/
             Integer tempGroupId;
             int k;
+            Map<String,Object> tempTagEmployeeData = new HashMap<String, Object>();
 
             for (int i = 0; i < len; i++){
                 List<Map<String,Object>> tempTagEmployeeDataList = new ArrayList<>();
-                Map<String,Object> tempTagEmployeeData = new HashMap<String, Object>();
                 WorkGroupDataVo detail =  list.get(i);
 
                 detail.setTotalFanNum(0);
@@ -79,14 +79,17 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
                 for (k = 0; k < employeeLen; k++) {
                     tempGroupId= Integer.parseInt(clist.get(k).get("group_id").toString());
 
-                    if(detail.getId().equals(tempGroupId)){
+                    if(detail.getId().equals(tempGroupId)){//分组匹配
+                        tempTagEmployeeData = new HashMap<String, Object>();
                         tempTagEmployeeData.put("privateTagId",clist.get(k).get("private_tag_id"));
                         tempTagEmployeeData.put("tagName",clist.get(k).get("tag_name"));
                         tempTagEmployeeData.put("num",clist.get(k).get("num"));
                         tempTagEmployeeDataList.add(tempTagEmployeeData);
                     }
                 }
+
                 detail.setEmployeeList(tempTagEmployeeDataList);
+                list.get(i).setEmployeeList(tempTagEmployeeDataList);
             }
 
         }

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

@@ -201,6 +201,10 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
             obj.eq("a.corp_id", corp_id);
         }
 
+        if (privateTagId != null) {
+            obj.eq("a.private_tag_id", privateTagId);
+        }
+
         if (authCorpIds != null || authCorpIds.size()>=1) {
             obj.in("a.corp_id", authCorpIds);
         }