|
@@ -99,6 +99,9 @@ public class QwExternalContactController extends BaseController
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private IFsUserCompanyBindService fsUserCompanyBindService;
|
|
private IFsUserCompanyBindService fsUserCompanyBindService;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private IQwGroupChatUserService qwGroupChatUserService;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 查询企业微信客户列表
|
|
* 查询企业微信客户列表
|
|
|
*/
|
|
*/
|
|
@@ -120,6 +123,14 @@ public class QwExternalContactController extends BaseController
|
|
|
}
|
|
}
|
|
|
List<QwExternalContactVO> list = qwExternalContactService.selectQwExternalContactListVO(qwExternalContact);
|
|
List<QwExternalContactVO> list = qwExternalContactService.selectQwExternalContactListVO(qwExternalContact);
|
|
|
list.forEach(item->{
|
|
list.forEach(item->{
|
|
|
|
|
+ if (StringUtils.isNotEmpty(item.getExternalUserId())) {
|
|
|
|
|
+ List<String> chatNameList = qwGroupChatUserService.selectChatNameByUserId(item.getExternalUserId());
|
|
|
|
|
+ if (StringUtils.isNotEmpty(qwExternalContact.getChatName()) && chatNameList.contains(qwExternalContact.getChatName())) {
|
|
|
|
|
+ item.setChatNames(chatNameList);
|
|
|
|
|
+ }else {
|
|
|
|
|
+ item.setChatNames(chatNameList);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
if (!Objects.equals(item.getTagIds(), "[]") && item.getTagIds()!=null) {
|
|
if (!Objects.equals(item.getTagIds(), "[]") && item.getTagIds()!=null) {
|
|
|
QwTagSearchParam param = new QwTagSearchParam();
|
|
QwTagSearchParam param = new QwTagSearchParam();
|
|
@@ -140,6 +151,11 @@ public class QwExternalContactController extends BaseController
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
});
|
|
});
|
|
|
|
|
+ if (StringUtils.isNotEmpty(qwExternalContact.getChatName())) {
|
|
|
|
|
+ list = list.stream()
|
|
|
|
|
+ .filter(item -> item.getChatNames() != null && !item.getChatNames().isEmpty())
|
|
|
|
|
+ .collect(Collectors.toList());
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
return getDataTable(list);
|
|
return getDataTable(list);
|
|
|
}
|
|
}
|