更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/devices/DeviceGroupController.java

@@ -107,7 +107,7 @@ public class DeviceGroupController {
     }
 
     @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "删除分组下的设备(多个)", description = "删除分组下的设备")
+    @Operation(summary = "删除分组下的设备(多个)", description = "删除分组下的设备(多个)")
     @RequestMapping(value = "deleteGroupDevicesInfo", method = {RequestMethod.POST})
     public ResultContent deleteGroupDevicesInfo(@RequestBody IDsParam param) {
         return this.deviceGroupService.deleteGroupDevicesInfo(param);

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/UserGroupController.java

@@ -4,6 +4,7 @@ import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.base.IDParam;
+import com.zhongshu.card.client.model.base.IDsParam;
 import com.zhongshu.card.client.model.org.userGroup.*;
 import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.server.core.service.org.UserGroupService;
@@ -105,6 +106,13 @@ public class UserGroupController {
         return this.userGroupService.deleteGroupUserInfo(param.getId());
     }
 
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "删除分组下的用户（多个）", description = "删除分组下的用户（多个）")
+    @RequestMapping(value = "deleteGroupUsersInfo", method = {RequestMethod.POST})
+    public ResultContent deleteGroupUsersInfo(@RequestBody IDsParam param) {
+        return this.userGroupService.deleteGroupUsersInfo(param);
+    }
+
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "分组用户数据列表-分页查询", description = "分组用户数据列表-分页查询")
     @RequestMapping(value = {"pageGroupUsers"}, method = {RequestMethod.POST})

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/devices/DeviceGroupToDeviceDao.java

@@ -24,4 +24,5 @@ public interface DeviceGroupToDeviceDao extends MongoDao<DeviceGroupToDevice>, D
 
     List<DeviceGroupToDevice> findByProjectOidAndDeviceId(String projectOid, String deviceId);
 
+    void deleteByDeviceGroup(DeviceGroup deviceGroup);
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/UserGroupToUserDao.java

@@ -24,4 +24,5 @@ public interface UserGroupToUserDao extends MongoDao<UserGroupToUser>, UserGroup
 
     List<UserGroupToUser> findByUserIdAndProjectOid(String userId, String projectOid);
 
+    void deleteByUserGroup(UserGroup userGroup);
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/DeviceGroupService.java

@@ -106,6 +106,7 @@ public class DeviceGroupService extends SuperService {
         }
         entity.setState(state);
         deviceGroupDao.save(entity);
+        deviceGroupToDeviceDao.deleteByDeviceGroup(entity);
         return ResultContent.buildSuccess();
     }
 
@@ -163,7 +164,12 @@ public class DeviceGroupService extends SuperService {
         if (ObjectUtils.isEmpty(param.getIds())) {
             return ResultContent.buildFail("ids不能为空");
         }
+        List<DeviceGroupToDevice> list = deviceGroupToDeviceDao.findByIdIn(param.getIds());
+        if (ObjectUtils.isEmpty(list)) {
+            return ResultContent.buildFail("数据不存在");
+        }
         deviceGroupToDeviceDao.deleteAllById(param.getIds());
+        initGroupNumber(list.get(0).getDeviceGroup());
         return ResultContent.buildSuccess();
     }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/UserGroupService.java

@@ -3,6 +3,7 @@ package com.zhongshu.card.server.core.service.org;
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
+import com.zhongshu.card.client.model.base.IDsParam;
 import com.zhongshu.card.client.model.org.userGroup.*;
 import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
@@ -85,6 +86,7 @@ public class UserGroupService extends SuperService {
             return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, id));
         }
         userGroupDao.delete(entity);
+        userGroupToUserDao.deleteByUserGroup(entity);
         return ResultContent.buildSuccess();
     }
 
@@ -155,6 +157,19 @@ public class UserGroupService extends SuperService {
         return ResultContent.buildSuccess();
     }
 
+    public ResultContent deleteGroupUsersInfo(IDsParam param) {
+        if (ObjectUtils.isEmpty(param.getIds())) {
+            return ResultContent.buildFail("ids不能为空");
+        }
+        List<UserGroupToUser> list = userGroupToUserDao.findByIdIn(param.getIds());
+        if (ObjectUtils.isEmpty(list)) {
+            return ResultContent.buildFail("数据不存在");
+        }
+        userGroupToUserDao.deleteAllById(param.getIds());
+        initGroupNumber(list.get(0).getUserGroup());
+        return ResultContent.buildSuccess();
+    }
+
     public void initGroupNumber(UserGroup userGroup) {
         if (ObjectUtils.isNotEmpty(userGroup)) {
             long number = userGroupToUserDao.countByUserGroup(userGroup);