Commit a3078e35 by 徐高华

Merge branch 'feature/社群' into 'master'

群初始化

See merge request !852
parents 178bbbfe ff647cae
...@@ -387,7 +387,7 @@ public class GroupChatServiceImpl implements GroupChatService { ...@@ -387,7 +387,7 @@ public class GroupChatServiceImpl implements GroupChatService {
return; return;
} }
String userId = staff.getWxUserId(); String userId = staff.getWxUserId();
if (qwDTO.needOpenUserIdDk()) { if (qwDTO.needOpenUserId3th()) {
userId = staff.getWxOpenUseId(); userId = staff.getWxOpenUseId();
} }
this.syncGroupChatList(qwDTO, Arrays.asList(userId), null, false); this.syncGroupChatList(qwDTO, Arrays.asList(userId), null, false);
...@@ -457,7 +457,7 @@ public class GroupChatServiceImpl implements GroupChatService { ...@@ -457,7 +457,7 @@ public class GroupChatServiceImpl implements GroupChatService {
return; return;
} }
List<String> userIdList = null; List<String> userIdList = null;
if (qwDTO.needOpenUserIdDk()) { if (qwDTO.needOpenUserId3th()) {
userIdList = Arrays.asList(wxOpenUserId); userIdList = Arrays.asList(wxOpenUserId);
} else { } else {
userIdList = Arrays.asList(wxUserId); userIdList = Arrays.asList(wxUserId);
...@@ -485,7 +485,7 @@ public class GroupChatServiceImpl implements GroupChatService { ...@@ -485,7 +485,7 @@ public class GroupChatServiceImpl implements GroupChatService {
} }
logger.info("查询staff表第{}页,共{}条,{}", pageNum + 1, staffList.size(), wxEnterpriseId); logger.info("查询staff表第{}页,共{}条,{}", pageNum + 1, staffList.size(), wxEnterpriseId);
List<String> userIdList = null; List<String> userIdList = null;
if (qwDTO.needOpenUserIdDk()) { if (qwDTO.needOpenUserId3th()) {
userIdList = staffList.stream().filter(dto -> StringUtils.isNotBlank(dto.getWxOpenUseId())) userIdList = staffList.stream().filter(dto -> StringUtils.isNotBlank(dto.getWxOpenUseId()))
.map(dto -> dto.getWxOpenUseId()).collect(Collectors.toList()); .map(dto -> dto.getWxOpenUseId()).collect(Collectors.toList());
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment