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 3b4cf34..b7ae2b4 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
@@ -11,6 +11,7 @@ import com.lyms.platform.operate.web.facade.AutoMatchFacade;
 import com.lyms.platform.operate.web.result.FrontEndResult;
 import com.lyms.platform.permission.model.*;
 import com.lyms.platform.permission.service.*;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -196,8 +198,13 @@ public class DepartmentsController extends   BaseController {
         List<Integer> orgId1 = autoMatchFacade.matchOrgId(loginState.getId());
         if(null!=orgId){
             departmentsQuery.setOrgId(orgId);
-        }else{
+        } else if (CollectionUtils.isNotEmpty(orgId1)){
             departmentsQuery.setOrgList(orgId1);
+        } else {
+            FrontEndResult frontEndResult = new FrontEndResult();
+            frontEndResult.setPageInfo(departmentsQuery.getPageInfo());
+            frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
+            return frontEndResult;
         }
 
         departmentsQuery.setPage(page);
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 7a464eb..d3fcdd2 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
@@ -238,7 +238,7 @@ public class OrganizationController extends BaseController {
         List<Integer> areaId = autoMatchFacade.matchOrgId(loginState.getId());
         List<Object> data = new ArrayList<>();
         List<Organization> organizations = new ArrayList<>();
-        PageInfo pageInfo =null;
+        PageInfo pageInfo = new PageInfo(0,0,0,1);
         if (CollectionUtils.isNotEmpty(areaId)) {
             OrganizationQuery organizationQuery = new OrganizationQuery();
             if(null != page && limit != page) {