|
@@ -1,5 +1,6 @@
|
|
|
package com.cyksj.web.controller.sys;
|
|
package com.cyksj.web.controller.sys;
|
|
|
|
|
|
|
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
|
import com.cyksj.config.corp.YHLXWxCorpConfig;
|
|
import com.cyksj.config.corp.YHLXWxCorpConfig;
|
|
|
import com.cyksj.dto.Result;
|
|
import com.cyksj.dto.Result;
|
|
|
import com.cyksj.enums.GatewayResponse;
|
|
import com.cyksj.enums.GatewayResponse;
|
|
@@ -8,6 +9,7 @@ import com.cyksj.model.request.sys.SysCorpFollowReq;
|
|
|
import com.cyksj.model.views.SysCorpFollowView;
|
|
import com.cyksj.model.views.SysCorpFollowView;
|
|
|
import com.cyksj.model.views.SysCorpMasterFollowView;
|
|
import com.cyksj.model.views.SysCorpMasterFollowView;
|
|
|
import com.cyksj.service.corp.CorpService;
|
|
import com.cyksj.service.corp.CorpService;
|
|
|
|
|
+import com.cyksj.service.corp.WxCorpOps;
|
|
|
import com.cyksj.service.sys.SysCorpFollowService;
|
|
import com.cyksj.service.sys.SysCorpFollowService;
|
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
|
import com.ejlchina.searcher.util.MapUtils;
|
|
import com.ejlchina.searcher.util.MapUtils;
|
|
@@ -43,6 +45,10 @@ public class SysCorpFollowController {
|
|
|
|
|
|
|
|
private final HttpServletRequest request;
|
|
private final HttpServletRequest request;
|
|
|
|
|
|
|
|
|
|
+ private final WxCorpOps wxCorpOps;
|
|
|
|
|
+
|
|
|
|
|
+ private final YHLXWxCorpConfig corpConfig;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 新增客服
|
|
* 新增客服
|
|
|
*/
|
|
*/
|
|
@@ -74,11 +80,16 @@ public class SysCorpFollowController {
|
|
|
* 客服列表
|
|
* 客服列表
|
|
|
*/
|
|
*/
|
|
|
@GetMapping("/get")
|
|
@GetMapping("/get")
|
|
|
- public Result<List<SysCorpFollowView>> get() {
|
|
|
|
|
|
|
+ public Result<List<SysCorpFollowView>> get() throws Exception {
|
|
|
|
|
+ List<String> res = wxCorpOps.getPermitUserList(corpConfig.getCorpId(), null);
|
|
|
List<SysCorpFollowView> sysCorpFollowViews = beanSearcher.searchAll(SysCorpFollowView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
|
|
List<SysCorpFollowView> sysCorpFollowViews = beanSearcher.searchAll(SysCorpFollowView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
|
|
|
sysCorpFollowViews.forEach(e->{
|
|
sysCorpFollowViews.forEach(e->{
|
|
|
Integer num = corpUserFollowRelationMapper.selectNumOfCorpuserByFollowId(e.getFollowId());
|
|
Integer num = corpUserFollowRelationMapper.selectNumOfCorpuserByFollowId(e.getFollowId());
|
|
|
e.setNumOfCorpUser(num);
|
|
e.setNumOfCorpUser(num);
|
|
|
|
|
+ //是否开启企业会话
|
|
|
|
|
+ if (CollUtil.isNotEmpty(res) && res.contains(e.getFollowId())) {
|
|
|
|
|
+ e.setIsOpen(true);
|
|
|
|
|
+ }
|
|
|
});
|
|
});
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(sysCorpFollowViews);
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(sysCorpFollowViews);
|
|
|
}
|
|
}
|