From 6622a5936bdfb76aa98ece98c6dc8efd99e43696 Mon Sep 17 00:00:00 2001
From: "xie.bx" <Blue_Xie@epam.com>
Date: Wed, 24 May 2023 22:50:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug:=20=E7=94=A8=E6=88=B7id>1?=
 =?UTF-8?q?28=E6=97=B6,=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-platform/pom.xml                                       | 8 +-------
 .../com/bx/implatform/service/impl/GroupServiceImpl.java  | 4 ++--
 .../com/bx/implatform/service/impl/UserServiceImpl.java   | 2 +-
 im-server/pom.xml                                         | 8 +-------
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/im-platform/pom.xml b/im-platform/pom.xml
index de6c24e..5a8225a 100644
--- a/im-platform/pom.xml
+++ b/im-platform/pom.xml
@@ -114,13 +114,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <version>2.0.3.RELEASE</version>
             </plugin>
         </plugins>
     </build>
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<GroupMapper, Group> implements
         if(groupMembers.isEmpty()){
             return Collections.EMPTY_LIST;
         }
-        // 拉取群信息
+        // 拉取群列表
         List<Long> ids = groupMembers.stream().map((gm -> gm.getGroupId())).collect(Collectors.toList());
         QueryWrapper<Group> groupWrapper = new QueryWrapper();
         groupWrapper.lambda().in(Group::getId, ids);
@@ -238,7 +238,7 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
         // 转vo
         List<GroupVO> 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<UserMapper, User> 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..41b4624 100644
--- a/im-server/pom.xml
+++ b/im-server/pom.xml
@@ -44,13 +44,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <version>2.0.3.RELEASE</version>
             </plugin>
         </plugins>
     </build>