diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
index c883680..af18d63 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
@@ -4,6 +4,7 @@ package com.lyms.platform.permission.model;
 import com.lyms.platform.common.dao.BaseQuery;
 
 import java.util.Date;
+import java.util.List;
 
 
 public class UsersQuery extends BaseQuery {
@@ -34,6 +35,17 @@ public class UsersQuery extends BaseQuery {
         return otherAccount;
     }
 
+
+    public List<Integer> orgIds;      //这些机构下的用户
+
+    public List<Integer> getOrgIds() {
+        return orgIds;
+    }
+
+    public void setOrgIds(List<Integer> orgIds) {
+        this.orgIds = orgIds;
+    }
+
     public void setOtherAccount(Integer otherAccount) {
         this.otherAccount = otherAccount;
     }
diff --git a/platform-biz-service/src/main/resources/mainOrm/Users.xml b/platform-biz-service/src/main/resources/mainOrm/Users.xml
index 7fdf78b..1be49d7 100644
--- a/platform-biz-service/src/main/resources/mainOrm/Users.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/Users.xml
@@ -211,8 +211,11 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p
         <if test="ksId != null">
             and u.ks_id = #{ksId,jdbcType=INTEGER}
         </if>
-        <if test="orgId != null">
-            and u.org_id = #{orgId,jdbcType=INTEGER}
+        <if test="orgIds != null">
+            and u.org_id in
+            <foreach collection="orgIds" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
         <if test="deptId != null">
             and u.dept_id = #{deptId,jdbcType=INTEGER}
@@ -245,8 +248,11 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p
         <if test="ksId != null and ksId != ''">
             and u.ks_id = #{ksId,jdbcType=INTEGER}
         </if>
-        <if test="orgId != null and orgId != ''">
-            and u.org_id = #{orgId,jdbcType=INTEGER}
+        <if test="orgIds != null">
+            and u.org_id in
+            <foreach collection="orgIds" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
         <if test="deptId != null and deptId != ''">
             and u.dept_id = #{deptId,jdbcType=INTEGER}
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 9680bce..3f1aaa2 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
@@ -52,6 +52,7 @@ public class OrganizationController extends BaseController {
     private AccessPermissionFacade accessPermissionFacade;
 
 
+
     /**
      * 删除机构
      */
@@ -221,7 +222,9 @@ public class OrganizationController extends BaseController {
     @RequestMapping(value = "/organization1", method = RequestMethod.GET)
     @ResponseBody
     @TokenRequired
-    public FrontEndResult getOrganization(HttpServletRequest request) {
+    public FrontEndResult getOrganization(HttpServletRequest request, @RequestParam(value = "page", required = false) Integer page,
+                                          @RequestParam(value = "limit", required = false) Integer limit,
+                                          @RequestParam(value = "keyword", required = false) String keyword) {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
 
         List<Integer> areaId = autoMatchFacade.matchOrgId(loginState.getId());
@@ -232,23 +235,36 @@ public class OrganizationController extends BaseController {
             OrganizationQuery organizationQuery = new OrganizationQuery();
             organizationQuery.setNeed("true");
             organizationQuery.setSort("province_id desc,city_id desc,area_id desc");
+            organizationQuery.setPage(page);
+            organizationQuery.setLimit(limit);
             organizationQuery.setYn(YnEnums.YES.getId());
             organizationQuery.setIdList(areaId);
-            List<Integer> list = new ArrayList<>();
-            list.add(3);
-            list.add(4);
-            organizationQuery.setYn(YnEnums.YES.getId());
+            organizationQuery.setKeyword(keyword);
+//            List<Integer> list = new ArrayList<>();
+//            list.add(3);
+//            list.add(4);
+//            organizationQuery.setYn(YnEnums.YES.getId());
 //            organizationQuery.setTypeList(list);
             organizations = organizationService.queryOrganization(organizationQuery);
             pageInfo=organizationQuery.getPageInfo();
 
         } else {
-            UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery();
-            userOrganizationMapsQuery.setYn(YnEnums.YES.getId());
-            userOrganizationMapsQuery.setUserId(loginState.getId());
-            organizations = accessPermissionFacade.findAccessPerminssionByUserId(loginState.getId());
-            userOrganizationMapsQuery.mysqlBuild(organizations.size());
-            pageInfo=userOrganizationMapsQuery.getPageInfo();
+//            UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery();
+//            userOrganizationMapsQuery.setYn(YnEnums.YES.getId());
+//            userOrganizationMapsQuery.setUserId(loginState.getId());
+//            organizations = accessPermissionFacade.findAccessPerminssionByUserId(loginState.getId());
+//            userOrganizationMapsQuery.mysqlBuild(organizations.size());
+//            pageInfo=userOrganizationMapsQuery.getPageInfo();
+
+            OrganizationQuery organizationQuery = new OrganizationQuery();
+            organizationQuery.setNeed("tree");
+            organizationQuery.setSort("province_id desc,city_id desc,area_id desc");
+            organizationQuery.setLimit(limit);
+            organizationQuery.setKeyword(keyword);
+            organizationQuery.setPage(page);
+            organizationQuery.setYn(YnEnums.YES.getId());
+            organizations = organizationService.queryOrganization(organizationQuery);
+            pageInfo = organizationQuery.getPageInfo();
         }
         if (CollectionUtils.isNotEmpty(organizations)) {
             for (Organization organization : organizations) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java
index 6474d8b..cf4504f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java
@@ -87,7 +87,7 @@ public class RegionController extends BaseController{
         }
 
 
-        if (user.getType().equals(0) && ("0".equals(parentId) || StringUtils.isBlank(parentId))) {
+        if (user.getType().equals(2) || user.getType().equals(0) && ("0".equals(parentId) || StringUtils.isBlank(parentId))) {
             parentId = SystemConfig.CHINA_BASIC_ID;
             query.setParentId(parentId);
         }
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 6111ff1..a94c4ab 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
@@ -12,6 +12,7 @@ import com.lyms.platform.operate.web.facade.AccessPermissionFacade;
 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.beans.factory.annotation.Value;
@@ -120,22 +121,37 @@ public class UsersController extends BaseController {
                                @RequestParam(value = "deptId", required = false) Integer deptId) {
         LoginContext loginContext = (LoginContext) request.getAttribute("loginContext");
         Users u = usersService.getUsers(loginContext.getId());
+
+
+        List<Integer> ids = null;
         if(u.getType().equals(1)) {
             orgId = u.getOrgId();
+        }else if(u.getType().equals(0)) {
+            List<Organization> organizations = accessPermissionFacade.findAccessPerminssionByUserId(u.getId());
+            ids = new ArrayList<>();
+            if(CollectionUtils.isNotEmpty(organizations)) {
+                for(Organization organization : organizations) {
+                    ids.add(organization.getId());
+                }
+            }
         }
 
+        if(null != orgId) {
+            ids = new ArrayList<>();
+            ids.add(orgId);
+        }
 
+        UsersQuery usersQuery = new UsersQuery();
         limit = limit == null ? 10 : limit;
         page = page == null ? 1 : page;
 
-        UsersQuery usersQuery = new UsersQuery();
         usersQuery.setNeed("true");
         usersQuery.setSort("id desc");
         usersQuery.setYn(YnEnums.YES.getId());
         usersQuery.setDeptId(deptId);
         usersQuery.setKeyword(keyword);
         usersQuery.setType(1);
-        usersQuery.setOrgId(orgId);
+        usersQuery.setOrgIds(ids);
         usersQuery.setPage(page);
         usersQuery.setLimit(limit);
         usersQuery.setRoleId(rolesId);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java
index 1cc8691..1cce037 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java
@@ -69,7 +69,7 @@ public class AutoMatchFacade {
                         data.add(users.getOrgId());
                     }
                 }
-            }  else if(list.get(0).getType() == 1){
+            }  else if(list.get(0).getType() == 0){
                 List<Organization> list2  =accessPermissionFacade.findAccessPerminssionByUserId(list.get(0).getId());
                 if(CollectionUtils.isNotEmpty(list2)){
                     for(Organization organization:list2){