diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
index c4c2ce5..4fbf97b 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
@@ -1,12 +1,15 @@
 package com.lyms.platform.permission.service.impl;
 
+import com.lyms.platform.common.enums.OrganizationTypeEnum;
 import com.lyms.platform.permission.dao.OrganizationMapper;
 import com.lyms.platform.permission.model.Organization;
 import com.lyms.platform.permission.model.OrganizationQuery;
 import com.lyms.platform.permission.service.OrganizationService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -32,7 +35,16 @@ public class OrganizationServiceImpl implements OrganizationService {
 
     @Override
     public Organization getOrganization(Integer id) {
-        return organizationMapper.getOrganization(id);
+        Organization organization = organizationMapper.getOrganization(id);
+        //设置机构类型 0 公司 1 医院
+        if(null != organization.getType() &&
+                (organization.getType().equals(OrganizationTypeEnum.NY.getId()) || organization.getType().equals(OrganizationTypeEnum.FB.getId()) ||
+                        organization.getType().equals(OrganizationTypeEnum.TY.getId())|| organization.getType().equals(OrganizationTypeEnum.JMQY.getId()))) {
+            organization.setOrgType(1);
+        } else {
+            organization.setOrgType(0);
+        }
+        return organization;
     }
 
     @Override
@@ -45,7 +57,20 @@ public class OrganizationServiceImpl implements OrganizationService {
         if (query.getNeed() != null) {
             query.mysqlBuild(organizationMapper.queryOrganizationCount(query));
         }
-        return organizationMapper.queryOrganization(query);
+        List<Organization> organizations =  organizationMapper.queryOrganization(query);
+        if(CollectionUtils.isNotEmpty(organizations)) {
+            for(Organization organization : organizations) {
+                //设置机构类型 0 公司 1 医院
+                if(null != organization.getType() &&
+                        (organization.getType().equals(OrganizationTypeEnum.NY.getId()) || organization.getType().equals(OrganizationTypeEnum.FB.getId()) ||
+                                organization.getType().equals(OrganizationTypeEnum.TY.getId())|| organization.getType().equals(OrganizationTypeEnum.JMQY.getId()))) {
+                    organization.setOrgType(1);
+                } else {
+                    organization.setOrgType(0);
+                }
+            }
+        }
+        return organizations;
     }
 
     public List<String> queryProvinceIdByOrgId(List<Integer> orgId) {
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 ebc81e3..7a464eb 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
@@ -233,10 +233,11 @@ public class OrganizationController extends BaseController {
                                           @RequestParam(value = "keyword", required = false) String keyword,
                                           @RequestParam(value = "areaId", required = false) String aId) {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        Users users = usersService.getUsers(loginState.getId());
 
         List<Integer> areaId = autoMatchFacade.matchOrgId(loginState.getId());
         List<Object> data = new ArrayList<>();
-        List<Organization> organizations;
+        List<Organization> organizations = new ArrayList<>();
         PageInfo pageInfo =null;
         if (CollectionUtils.isNotEmpty(areaId)) {
             OrganizationQuery organizationQuery = new OrganizationQuery();
@@ -281,7 +282,7 @@ public class OrganizationController extends BaseController {
             organizations = organizationService.queryOrganization(organizationQuery);
             pageInfo=organizationQuery.getPageInfo();
 
-        } else {
+        } else if(null == areaId && users.getType().equals(2)){
 //            UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery();
 //            userOrganizationMapsQuery.setYn(YnEnums.YES.getId());
 //            userOrganizationMapsQuery.setUserId(loginState.getId());
@@ -342,15 +343,6 @@ public class OrganizationController extends BaseController {
                     organization.setStreet(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getStreetId()), true));
                 }
 
-                //璁剧疆鏈烘瀯绫诲瀷 0 鍏徃 1 鍖婚櫌
-                if(null != organization.getType() &&
-                        (organization.getType().equals(OrganizationTypeEnum.NY.getId()) || organization.getType().equals(OrganizationTypeEnum.FB.getId()) ||
-                            organization.getType().equals(OrganizationTypeEnum.TY.getId())|| organization.getType().equals(OrganizationTypeEnum.JMQY.getId()))) {
-                    organization.setOrgType(1);
-                } else {
-                    organization.setOrgType(0);
-                }
-
                 data.add(organization);
             }
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
index 8fa5a21..fc4ed37 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
@@ -4,6 +4,7 @@ package com.lyms.platform.operate.web.controller;
 import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.base.BaseController;
 import com.lyms.platform.common.base.LoginContext;
+import com.lyms.platform.common.base.PageInfo;
 import com.lyms.platform.common.constants.ConstantInterface;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.YnEnums;
@@ -125,7 +126,14 @@ public class UsersController extends BaseController {
 
         List<Integer> ids = null;
         if(u.getType().equals(1)) {
-            orgId = u.getOrgId();
+            if(null != u.getOrgId()) {
+                orgId = u.getOrgId();
+            } else {
+                FrontEndResult frontEndResult = new FrontEndResult();
+                frontEndResult.setPageInfo(new PageInfo(0,0,0,10));
+                frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
+                return  frontEndResult;
+            }
         }else if(u.getType().equals(0)) {
             List<Organization> organizations = accessPermissionFacade.findAccessPerminssionByUserId(u.getId());
             ids = new ArrayList<>();
@@ -133,6 +141,11 @@ public class UsersController extends BaseController {
                 for(Organization organization : organizations) {
                     ids.add(organization.getId());
                 }
+            } else {
+                FrontEndResult frontEndResult = new FrontEndResult();
+                frontEndResult.setPageInfo(new PageInfo(0,0,0,10));
+                frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
+                return  frontEndResult;
             }
         }