diff --git a/src/main/java/com/ruoyi/device/controller/GroupController.java b/src/main/java/com/ruoyi/device/controller/GroupController.java index f8d81f7..73b4476 100644 --- a/src/main/java/com/ruoyi/device/controller/GroupController.java +++ b/src/main/java/com/ruoyi/device/controller/GroupController.java @@ -12,10 +12,12 @@ import com.ruoyi.device.service.dto.DockDetailDTO; import com.ruoyi.device.service.dto.DockGroupDTO; import com.ruoyi.device.service.dto.GroupDTO; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * 分组Controller @@ -101,7 +103,14 @@ public class GroupController extends BaseController @PostMapping("/switch") public R switchDockGroup(@RequestBody SwitchDockGroupRequest request) { - groupService.switchDockGroup(request.getDockId(), request.getGroupId()); + if(Objects.nonNull(request.getDockId())){ + groupService.switchDockGroup(request.getDockId(), request.getGroupId()); + } + if(!CollectionUtils.isEmpty(request.getDockIds())){ + for (Long dockId : request.getDockIds()) { + groupService.switchDockGroup(dockId, request.getGroupId()); + } + } return R.ok(); }