From b9b4bd5084495795383ced4c1a42e94622f60ee9 Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Sat, 7 Sep 2024 22:25:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E8=81=8A=E5=88=A0=E9=99=A4=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=94=B9=E4=B8=BA=E8=A7=A3=E6=95=A3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/im-platform.sql                                            | 2 +-
 im-platform/src/main/java/com/bx/implatform/entity/Group.java | 2 +-
 .../java/com/bx/implatform/service/impl/GroupServiceImpl.java | 4 ++--
 im-platform/src/main/java/com/bx/implatform/vo/GroupVO.java   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/db/im-platform.sql b/db/im-platform.sql
index ea7bc6a..1e62eca 100644
--- a/db/im-platform.sql
+++ b/db/im-platform.sql
@@ -49,7 +49,7 @@ create table `im_group`(
     `notice` varchar(1024)  default '' comment '群公告',
     `is_banned` tinyint(1) default 0 comment '是否被封禁 0:否 1:是',
     `reason` varchar(255) default '' comment '被封禁原因',
-    `deleted` tinyint(1) default 0   comment '是否已删除',
+    `dissolve` tinyint(1) default 0   comment '是否已解散',
     `created_time` datetime default CURRENT_TIMESTAMP comment '创建时间'
 )ENGINE=InnoDB CHARSET=utf8mb4 comment '群';
 
diff --git a/im-platform/src/main/java/com/bx/implatform/entity/Group.java b/im-platform/src/main/java/com/bx/implatform/entity/Group.java
index 86cdd55..06ba349 100644
--- a/im-platform/src/main/java/com/bx/implatform/entity/Group.java
+++ b/im-platform/src/main/java/com/bx/implatform/entity/Group.java
@@ -65,7 +65,7 @@ public class Group {
     /**
      * 是否已删除
      */
-    private Boolean deleted;
+    private Boolean dissolve;
 
 
 
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 579fd69..ba8389c 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
@@ -114,7 +114,7 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
         // 群聊用户id
         List<Long> userIds = groupMemberService.findUserIdsByGroupId(groupId);
         // 逻辑删除群数据
-        group.setDeleted(true);
+        group.setDissolve(true);
         this.updateById(group);
         // 删除成员数据
         groupMemberService.removeByGroupId(groupId);
@@ -190,7 +190,7 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
         if (Objects.isNull(group)) {
             throw new GlobalException("群组不存在");
         }
-        if (group.getDeleted()) {
+        if (group.getDissolve()) {
             throw new GlobalException("群组'" + group.getName() + "'已解散");
         }
         if (group.getIsBanned()) {
diff --git a/im-platform/src/main/java/com/bx/implatform/vo/GroupVO.java b/im-platform/src/main/java/com/bx/implatform/vo/GroupVO.java
index 002c4c4..61abfa3 100644
--- a/im-platform/src/main/java/com/bx/implatform/vo/GroupVO.java
+++ b/im-platform/src/main/java/com/bx/implatform/vo/GroupVO.java
@@ -44,8 +44,8 @@ public class GroupVO {
     @Schema(description = "群名备注")
     private String remarkGroupName;
 
-    @Schema(description = "是否已删除")
-    private Boolean deleted;
+    @Schema(description = "是否已解散")
+    private Boolean dissolve;
 
     @Schema(description = "是否已退出")
     private Boolean quit;