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 869ece0..b6a4c29 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
@@ -65,6 +65,15 @@ public class DepartmentsController extends   BaseController {
             return;
         }
 
+        UsersQuery usersQuery = new UsersQuery();
+        usersQuery.setYn(YnEnums.YES.getId());
+        usersQuery.setDeptId(id);
+        Integer count  = usersService.queryUsersCount(usersQuery);
+        if(0 < count) {
+            ResultUtils.buildParameterErrorResultAndWrite(response, "部门/科室下有用户数据，不能删除");
+            return;
+        }
+
         departments.setYn(YnEnums.NO.getId());
         departments.setModified(new Date());
         departmentsService.updateDepartments(departments);
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 a5a7d32..3d41944 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
@@ -282,19 +282,21 @@ public class RolesController extends BaseController {
         roles.setModified(new Date());
         rolesService.updateRoles(roles);
 
-        //中间表数据处理
+
+        //如果有数据不能删除
         UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery();
         userRoleMapsQuery.setRoleId(id);
-        List<UserRoleMaps> userRoleMapses = userRoleMapsService.queryUserRoleMaps(userRoleMapsQuery);
-        if (null != userRoleMapses) {
-            for (UserRoleMaps userRoleMaps : userRoleMapses) {
-                userRoleMaps.setYn(YnEnums.NO.getId());
-                userRoleMapsService.updateUserRoleMaps(userRoleMaps);
-            }
+        userRoleMapsQuery.setYn(YnEnums.YES.getId());
+        Integer count = userRoleMapsService.queryUserRoleMapsCount(userRoleMapsQuery);
+        if(count > 0) {
+            ResultUtils.buildParameterErrorResultAndWrite(response, "该角色下有用户数据，不能删除");
+            return;
         }
 
+        //角色权限设置为无效
         RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery();
         rolePermissionMapsQuery.setRoleId(id);
+        rolePermissionMapsQuery.setYn(YnEnums.YES.getId());
         List<RolePermissionMaps> rolePermissionMapsList = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery);
         if (null != rolePermissionMapsList) {
             for (RolePermissionMaps rolePermissionMaps : rolePermissionMapsList) {