diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
index 495c8c0..598b07b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
@@ -10,10 +10,7 @@ import com.lyms.platform.common.enums.OrganizationTypeEnum;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.utils.ResultUtils;
 import com.lyms.platform.operate.web.result.FrontEndResult;
-import com.lyms.platform.permission.model.Organization;
-import com.lyms.platform.permission.model.OrganizationQuery;
-import com.lyms.platform.permission.model.Regions;
-import com.lyms.platform.permission.model.Users;
+import com.lyms.platform.permission.model.*;
 import com.lyms.platform.permission.service.*;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +35,8 @@ public class OrganizationController extends BaseController {
     private OrganizationService organizationService;
     @Autowired
     private RegionsService regionsService;
+    @Autowired
+    private DepartmentsService departmentsService;
 
 
     /**
@@ -58,6 +57,24 @@ public class OrganizationController extends BaseController {
             return;
         }
 
+        //机构有使用 不能删除
+        UsersQuery usersQuery = new UsersQuery();
+        usersQuery.setOrgId(organization.getId());
+        usersQuery.setYn(YnEnums.YES.getId());
+        if(0 < usersService.queryUsersCount(usersQuery)) {
+            ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.DONT_DELETE, "机构下有用户信息，不能删除！");
+            return;
+        }
+
+        DepartmentsQuery departmentsQuery = new DepartmentsQuery();
+        departmentsQuery.setYn(YnEnums.YES.getId());
+        departmentsQuery.setOrgId(organization.getId());
+        if(0 < departmentsService.queryDepartmentsCount(departmentsQuery)) {
+            ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.DONT_DELETE, "机构下有部门信息，不能删除！");
+            return;
+        }
+
+        //删除机构
         organization.setYn(YnEnums.NO.getId());
         organization.setModified(new Date());
         organizationService.updateOrganization(organization);