Commit 61279daa by 徐高华

parent 3300e802
...@@ -412,6 +412,13 @@ public class GroupChatServiceImpl implements GroupChatService { ...@@ -412,6 +412,13 @@ public class GroupChatServiceImpl implements GroupChatService {
} }
} }
private String emoji(String content) {
if (StringUtils.isBlank(content)) {
return content ;
}
return EmojiParser.removeAllEmojis(content);
}
private void updateGroupChatDetail(WxEnterpriseQwDTO qwDTO, TabGroupChat chat, boolean syncMember) { private void updateGroupChatDetail(WxEnterpriseQwDTO qwDTO, TabGroupChat chat, boolean syncMember) {
// 控制同时刷新 // 控制同时刷新
Long groupChatId = chat.getGroupChatId(); Long groupChatId = chat.getGroupChatId();
...@@ -425,14 +432,8 @@ public class GroupChatServiceImpl implements GroupChatService { ...@@ -425,14 +432,8 @@ public class GroupChatServiceImpl implements GroupChatService {
return; return;
} }
GroupChatDetailDTO detail = detailResp.getResult(); GroupChatDetailDTO detail = detailResp.getResult();
String chatName = detail.getName(); String chatName = this.emoji(detail.getName());
if (StringUtils.isNotBlank(chatName)) { String notice = this.emoji(detail.getNotice());
chatName = EmojiParser.removeAllEmojis(chatName);
}
String notice = detail.getNotice();
if (StringUtils.isNotBlank(notice)) {
notice = EmojiParser.removeAllEmojis(notice);
}
chat.setGroupChatId(groupChatId); chat.setGroupChatId(groupChatId);
chat.setChatAddTime(new Date(detail.getCreate_time() * 1000)); chat.setChatAddTime(new Date(detail.getCreate_time() * 1000));
chat.setChatNotice(notice); chat.setChatNotice(notice);
...@@ -507,6 +508,8 @@ public class GroupChatServiceImpl implements GroupChatService { ...@@ -507,6 +508,8 @@ public class GroupChatServiceImpl implements GroupChatService {
List<GroupChatUserIdDTO> adminList = detail.getAdmin_list(); List<GroupChatUserIdDTO> adminList = detail.getAdmin_list();
List<String> adminIdList = adminList.stream().map(dto -> dto.getUserid()).collect(Collectors.toList()); List<String> adminIdList = adminList.stream().map(dto -> dto.getUserid()).collect(Collectors.toList());
for (GroupChatDetailMemberDTO member : memberList) { for (GroupChatDetailMemberDTO member : memberList) {
String userName = this.emoji(member.getName());
String nickName = this.emoji(member.getGroup_nickname());
String userId = member.getUserid(); String userId = member.getUserid();
TabGroupChatUser user = userMap.get(userId); TabGroupChatUser user = userMap.get(userId);
if (null != user) { if (null != user) {
...@@ -523,6 +526,8 @@ public class GroupChatServiceImpl implements GroupChatService { ...@@ -523,6 +526,8 @@ public class GroupChatServiceImpl implements GroupChatService {
if (user.getUserType() == 3) { if (user.getUserType() == 3) {
totalMemberCount++; totalMemberCount++;
} }
user.setUserName(userName);
user.setNickName(nickName);
this.groupChatUserMapper.update(user); this.groupChatUserMapper.update(user);
continue; continue;
} }
...@@ -538,8 +543,8 @@ public class GroupChatServiceImpl implements GroupChatService { ...@@ -538,8 +543,8 @@ public class GroupChatServiceImpl implements GroupChatService {
user.setEnterpriseId(enterpriseId); user.setEnterpriseId(enterpriseId);
user.setUserType(member.getType()); user.setUserType(member.getType());
user.setJoinTime(new Date(member.getJoin_time() * 1000)); user.setJoinTime(new Date(member.getJoin_time() * 1000));
user.setUserName(member.getName()); user.setUserName(userName);
user.setNickName(member.getGroup_nickname()); user.setNickName(nickName);
user.setGroupChatId(groupChatId); user.setGroupChatId(groupChatId);
user.setUserId(userId); user.setUserId(userId);
user.setJoinScene(member.getJoin_scene()); user.setJoinScene(member.getJoin_scene());
......
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