|
@@ -101,16 +101,21 @@ public class SysCorpFollowController {
|
|
|
*/
|
|
*/
|
|
|
@GetMapping("/get")
|
|
@GetMapping("/get")
|
|
|
public Result<List<SysCorpFollowView>> get(@RequestParam(required = false) Boolean isOpen) throws Exception {
|
|
public Result<List<SysCorpFollowView>> get(@RequestParam(required = false) Boolean isOpen) throws Exception {
|
|
|
- List<String> res = wxCorpOps.getPermitUserList(corpConfig.getCorpId(), null);
|
|
|
|
|
|
|
+ List<String> res = null;
|
|
|
|
|
+ try {
|
|
|
|
|
+ res = wxCorpOps.getPermitUserList(corpConfig.getCorpId(), null);
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
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 -> {
|
|
|
|
|
|
|
+ for (SysCorpFollowView e : sysCorpFollowViews) {
|
|
|
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())) {
|
|
|
|
|
|
|
+ if (res != null && CollUtil.isNotEmpty(res) && res.contains(e.getFollowId())) {
|
|
|
e.setIsOpen(true);
|
|
e.setIsOpen(true);
|
|
|
}
|
|
}
|
|
|
- });
|
|
|
|
|
|
|
+ }
|
|
|
if (isOpen != null) {
|
|
if (isOpen != null) {
|
|
|
sysCorpFollowViews = sysCorpFollowViews.stream().filter(e -> e.getIsOpen() == isOpen).collect(Collectors.toList());
|
|
sysCorpFollowViews = sysCorpFollowViews.stream().filter(e -> e.getIsOpen() == isOpen).collect(Collectors.toList());
|
|
|
}
|
|
}
|