diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
index ef50a00..e368691 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
@@ -93,7 +93,15 @@ public class DepartmentsController extends   BaseController {
             ResultUtils.buildParameterErrorResultAndWrite(response,"该部门不存在");
             return;
         }
-
+        if(!departments.getName().equals(name)) {
+            DepartmentsQuery departmentsQuery = new DepartmentsQuery();
+            departments.setYn(YnEnums.YES.getId());
+            departmentsQuery.setName(name);
+            if(0 < departmentsService.queryDepartmentsCount(departmentsQuery)) {
+                ResultUtils.buildParameterErrorResultAndWrite(response,"该部门已存在");
+                return;
+            }
+        }
 
         pid = pid == null ? 0 : pid;
         departments.setParentId(pid);
@@ -137,6 +145,7 @@ public class DepartmentsController extends   BaseController {
         }
         DepartmentsQuery departmentsQuery = new DepartmentsQuery();
         departmentsQuery.setName(name);
+        departmentsQuery.setYn(YnEnums.YES.getId());
         if(0 < departmentsService.queryDepartmentsCount(departmentsQuery)) {
             ResultUtils.buildParameterErrorResultAndWrite(response,"该部门已存在");
             return;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
index 119dfeb..fe3e399 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
@@ -235,10 +235,20 @@ public class RolesController extends BaseController {
         }
         Roles roles = rolesService.getRoles(id);
         if (roles==null){
-            new BusinessException("", "根据id获取信息不存在.");
+            new BusinessException("", "角色信息不存在.");
             return;
         }
 
+        if(!roles.getName().equals(name)) {
+            RolesQuery rolesQuery = new RolesQuery();
+            rolesQuery.setYn(YnEnums.YES.getId());
+            rolesQuery.setName(name);
+            if(0 < rolesService.queryRolesCount(rolesQuery)) {
+                ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.NAME_EXIST, "角色名称已存在");
+                return;
+            }
+        }
+
         roles.setName(name);
         roles.setEnable(enable);
         roles.setRemarks(remarks);