diff --git a/src/main/java/com/ruoyi/device/controller/GroupController.java b/src/main/java/com/ruoyi/device/controller/GroupController.java
index 4fd877f..f8d81f7 100644
--- a/src/main/java/com/ruoyi/device/controller/GroupController.java
+++ b/src/main/java/com/ruoyi/device/controller/GroupController.java
@@ -42,10 +42,17 @@ public class GroupController extends BaseController
     @PostMapping("/create")
     public R<Long> createGroup(@RequestBody GroupCreateRequest request)
     {
-        GroupDTO dto = new GroupDTO();
-        dto.setGroupName(request.getGroupName());
-        Long groupId = groupService.createGroup(dto);
-        return R.ok(groupId);
+        try
+        {
+            GroupDTO dto = new GroupDTO();
+            dto.setGroupName(request.getGroupName());
+            Long groupId = groupService.createGroup(dto);
+            return R.ok(groupId);
+        }
+        catch (RuntimeException e)
+        {
+            return R.fail("新增分组'" + request.getGroupName() + "'失败，分组名称已存在");
+        }
     }
     /**
      * 删除分组
@@ -71,11 +78,18 @@ public class GroupController extends BaseController
     @PostMapping("/update")
     public R<Void> updateGroup(@RequestBody GroupUpdateRequest request)
     {
-        GroupDTO dto = new GroupDTO();
-        dto.setGroupId(request.getGroupId());
-        dto.setGroupName(request.getGroupName());
-        groupService.updateGroup(dto);
-        return R.ok();
+        try
+        {
+            GroupDTO dto = new GroupDTO();
+            dto.setGroupId(request.getGroupId());
+            dto.setGroupName(request.getGroupName());
+            groupService.updateGroup(dto);
+            return R.ok();
+        }
+        catch (RuntimeException e)
+        {
+            return R.fail("修改分组'" + request.getGroupName() + "'失败，分组名称已存在");
+        }
     }
 
     /**