diff --git a/im-platform/pom.xml b/im-platform/pom.xml index de6c24e..c8309c9 100644 --- a/im-platform/pom.xml +++ b/im-platform/pom.xml @@ -114,6 +114,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.0.3.RELEASE diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java index b8dd66c..00c6b34 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java @@ -230,7 +230,7 @@ public class GroupServiceImpl extends ServiceImpl implements if(groupMembers.isEmpty()){ return Collections.EMPTY_LIST; } - // 拉取群信息 + // 拉取群列表 List ids = groupMembers.stream().map((gm -> gm.getGroupId())).collect(Collectors.toList()); QueryWrapper groupWrapper = new QueryWrapper(); groupWrapper.lambda().in(Group::getId, ids); @@ -238,7 +238,7 @@ public class GroupServiceImpl extends ServiceImpl implements // 转vo List vos = groups.stream().map(g -> { GroupVO vo = BeanUtils.copyProperties(g, GroupVO.class); - GroupMember member = groupMembers.stream().filter(m -> g.getId() == m.getGroupId()).findFirst().get(); + GroupMember member = groupMembers.stream().filter(m -> g.getId().equals(m.getGroupId())).findFirst().get(); vo.setAliasName(member.getAliasName()); vo.setRemark(member.getRemark()); return vo; diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java index 1fafcd2..644b80b 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java @@ -86,7 +86,7 @@ public class UserServiceImpl extends ServiceImpl implements IU @Override public void update(UserVO vo) { UserSession session = SessionContext.getSession(); - if(session.getId() != vo.getId()){ + if(!session.getId().equals(vo.getId()) ){ throw new GlobalException(ResultCode.PROGRAM_ERROR,"不允许修改其他用户的信息!"); } User user = this.getById(vo.getId()); diff --git a/im-server/pom.xml b/im-server/pom.xml index 397264a..18c3adf 100644 --- a/im-server/pom.xml +++ b/im-server/pom.xml @@ -44,6 +44,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.0.3.RELEASE diff --git a/im-ui/src/components/chat/ChatItem.vue b/im-ui/src/components/chat/ChatItem.vue index ad3e6a2..b5726b8 100644 --- a/im-ui/src/components/chat/ChatItem.vue +++ b/im-ui/src/components/chat/ChatItem.vue @@ -103,7 +103,7 @@ .mid { margin-left: 15px; - flex: 3; + flex: 2; display: flex; flex-direction: column; height: 100%;