fix(增加客服所在组)

src/main/java/com/mokamrp/privates/config/XxlSsoConfig.java

@@ -28,10 +28,6 @@ public class XxlSsoConfig implements DisposableBean {
     @Value("${xxl.sso.redis.address}")
     private String xxlSsoRedisAddress;
 
-    public static String getLogoutUrl(){
-        return Conf.SSO_SERVER+Conf.SSO_LOGOUT_PATH;
-    }
-
     @Bean
     public FilterRegistrationBean xxlSsoFilterRegistration() {
 

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

@@ -4,6 +4,7 @@ import com.mokamrp.privates.config.XxlSsoConfig;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.entity.LoginHandle;
 import com.mokamrp.privates.help.AjaxResult;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -25,10 +26,16 @@ import java.util.Map;
 @RequestMapping("/config")
 public class ConfigController{
 
+    @Value("${xxl.sso.server}")
+    private String xxlSsoServer;
+
+    @Value("${xxl.sso.logout.path}")
+    private String xxlSsoLogoutPath;
+
     @PostMapping("/info")
     public Object login() {
         Map<String, Object> resMap = new HashMap<String, Object>();
-        resMap.put("logoutUrl", XxlSsoConfig.getLogoutUrl());
+        resMap.put("logoutUrl", xxlSsoServer+xxlSsoLogoutPath);
         return AjaxResult.success( resMap);
     }
 

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

@@ -2,6 +2,7 @@ package com.mokamrp.privates.mapper;
 
 import com.mokamrp.privates.mapper.pojo.Downfile;
 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 gy
  * @since 2021-04-22
  */
+@Component
 public interface DownfileMapper extends BaseMapper<Downfile> {
 
 }

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mokamrp.privates.mapper.vo.WorkEmployeeVo;
 import com.mokamrp.privates.mapper.vo.WorkRoomVo;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -18,6 +19,7 @@ import java.util.List;
  * @author leon
  * @since 2021-04-20
  */
+@Component
 public interface WorkEmployeeMapper extends BaseMapper<WorkEmployee> {
 
     List<WorkEmployeeVo> getVoList(IPage<WorkEmployeeVo> page, @Param("ew") QueryWrapper<WorkEmployeeVo> queryWrapper);

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

@@ -14,6 +14,7 @@ import com.mokamrp.privates.mapper.pojo.*;
 import com.mokamrp.privates.mapper.vo.WorkEmployeeVo;
 import com.mokamrp.privates.mapper.vo.WorkRoomVo;
 import com.mokamrp.privates.service.UserCorpService;
+import com.mokamrp.privates.service.WorkContactRoomService;
 import com.mokamrp.privates.service.WorkEmployeeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.utils.OssFile;
@@ -47,6 +48,9 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
     private WorkContactEmployeeMapper workContactEmployeeMapper;
 
     @Autowired
+    private WorkContactRoomMapper workContactRoomMapper;
+
+    @Autowired
     private WorkEmployeeMapper workEmployeeMapper;
 
     @Autowired
@@ -207,6 +211,7 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
     private List<WorkEmployeeVo> getCommonList(Page<WorkEmployeeVo> pageObj, QueryWrapper<WorkEmployeeVo> room) {
 
         QueryWrapper<WorkContactEmployee> obj = new QueryWrapper<WorkContactEmployee>();
+        QueryWrapper<WorkContactRoom> workContactRoomObj = new QueryWrapper<WorkContactRoom>();
         QueryWrapper<WorkRoom> roomObj = new QueryWrapper<WorkRoom>();
         List<WorkEmployeeVo> list = workEmployeeMapper.getVoList(pageObj, room);
 
@@ -218,6 +223,11 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
             obj.select("count(*) as nums,employee_id").in("employee_id",ids).groupBy("employee_id");
             List<Map<String,Object>> contactList= workContactEmployeeMapper.selectMaps(obj);
 
+            workContactRoomObj.select("count(distinct(room_id)) as nums,employee_id").in("employee_id",ids)
+                    .eq("type",1)
+                    .groupBy("employee_id");
+            List<Map<String,Object>> workContactRoomList = workContactRoomMapper.selectMaps(workContactRoomObj);
+
             roomObj.select("count(*) as nums,owner_id").in("owner_id",ids).groupBy("owner_id");
             List<Map<String,Object>> roomList = workRoomMapper.selectMaps(roomObj);
 
@@ -226,6 +236,7 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
                 id = list.get(i).getId();
                 list.get(i).setRoomNum(0);
                 list.get(i).setFanNum(0);
+                list.get(i).setInGroupCnt(0);
                 for (Map<String,Object> r:roomList
                 ) {
                     if(r.get("owner_id").toString().equals(id.toString())){
@@ -240,6 +251,13 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
                     }
                 }
 
+                for (Map<String,Object> workContactRoom:workContactRoomList
+                ) {
+                    if(workContactRoom.get("employee_id").toString().equals(id.toString())){
+                        list.get(i).setInGroupCnt(Integer.parseInt(workContactRoom.get("nums").toString()));
+                    }
+                }
+
                 list.get(i).setThumbAvatar(ossConfiguration.getHost()+list.get(i).getThumbAvatar());
 
             }