diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java
index db08175..1913344 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java
@@ -17,6 +17,7 @@ public class Organization {
     private String provinceId;
     private String cityId;
     private String areaId;
+    private String streetId;      //街道 城镇
     private String address;
     private String description;
     private Integer publishId;
@@ -35,6 +36,14 @@ public class Organization {
 
     Map<String, Departments> departmentsMap = new HashMap<>();
 
+    public String getStreetId() {
+        return streetId;
+    }
+
+    public void setStreetId(String streetId) {
+        this.streetId = streetId;
+    }
+
     public Map<String, Departments> getDepartmentsMap() {
         return departmentsMap;
     }
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java
index 2e03740..f67f07d 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java
@@ -15,6 +15,7 @@ public class OrganizationQuery extends BaseQuery {
     private String provinceId;
     private String cityId;
     private String areaId;
+    private String streetId;      //街道 城镇
     private String address;
     private String description;
     private Integer publishId;
@@ -26,6 +27,15 @@ public class OrganizationQuery extends BaseQuery {
     private String keyword;
     private String foreignId;
 
+
+    public String getStreetId() {
+        return streetId;
+    }
+
+    public void setStreetId(String streetId) {
+        this.streetId = streetId;
+    }
+
     public String getForeignId() {
         return foreignId;
     }
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java
index 2519fe6..cd2e168 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java
@@ -5,6 +5,17 @@ import com.lyms.platform.permission.model.OrganizationQuery;
 
 import java.util.List;
 
-public interface OrganizationService {public void addOrganization(Organization obj);public void updateOrganization(Organization obj);public void deleteOrganization(Integer id);public Organization getOrganization(Integer id);public int queryOrganizationCount(OrganizationQuery query);public List<Organization> queryOrganization(OrganizationQuery query);
+public interface OrganizationService {
+    public void addOrganization(Organization obj);
+
+    public void updateOrganization(Organization obj);
+
+    public void deleteOrganization(Integer id);
+
+    public Organization getOrganization(Integer id);
+
+    public int queryOrganizationCount(OrganizationQuery query);
+
+    public List<Organization> queryOrganization(OrganizationQuery query);
 
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/resources/mainOrm/Organization.xml b/platform-biz-service/src/main/resources/mainOrm/Organization.xml
index 91476c5..bb5f17d 100644
--- a/platform-biz-service/src/main/resources/mainOrm/Organization.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/Organization.xml
@@ -10,6 +10,7 @@
         <result column="area_manage" property="areaManage" jdbcType="INTEGER"/>
         <result column="province_id" property="provinceId" jdbcType="VARCHAR"/>
         <result column="city_id" property="cityId" jdbcType="VARCHAR"/>
+        <result column="street_id" property="streetId" jdbcType="VARCHAR"/>
         <result column="area_id" property="areaId" jdbcType="VARCHAR"/>
         <result column="address" property="address" jdbcType="VARCHAR"/>
         <result column="description" property="description" jdbcType="VARCHAR"/>
@@ -25,8 +26,8 @@
 
     <insert id="addOrganization" parameterType="com.lyms.platform.permission.model.Organization">
         <selectKey order="AFTER" keyProperty="id" resultType="java.lang.Integer"> SELECT LAST_INSERT_ID() </selectKey>
-insert into organization (foreign_id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode)
-values (#{foreignId},#{name},#{type},#{level},#{areaManage},#{provinceId},#{cityId},#{areaId},#{address},#{description},#{publishId},#{publishName},#{yn},#{modified},#{created},#{shortCode})
+insert into organization (foreign_id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,street_id)
+values (#{foreignId},#{name},#{type},#{level},#{areaManage},#{provinceId},#{cityId},#{areaId},#{address},#{description},#{publishId},#{publishName},#{yn},#{modified},#{created},#{shortCode},#{streetId})
 </insert>
 
 
@@ -57,6 +58,9 @@ values (#{foreignId},#{name},#{type},#{level},#{areaManage},#{provinceId},#{city
             <if test="areaId != null">
                 area_id = #{areaId,jdbcType=INTEGER},
             </if>
+            <if test="streetId != null">
+                street_id = #{streetId,jdbcType=INTEGER},
+            </if>
             <if test="address != null and address != ''">
                 address = #{address,jdbcType=VARCHAR},
             </if>
@@ -92,7 +96,7 @@ delete from organization where id = #{id,jdbcType=INTEGER}
 
 
     <select id="getOrganization" resultMap="OrganizationResultMap" parameterType="java.lang.Integer">
-select id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id
+select id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id
  from organization where id = #{id,jdbcType=INTEGER}
 </select>
 
@@ -137,6 +141,9 @@ select id,name,type,level,area_manage,province_id,city_id,area_id,address,descri
             <if test="areaId != null">
                 and area_id = #{areaId,jdbcType=INTEGER}
             </if>
+            <if test="streetId != null">
+                and street_id = #{streetId,jdbcType=INTEGER}
+            </if>
             <if test="address != null and address != ''">
                 and address = #{address,jdbcType=VARCHAR}
             </if>
@@ -171,7 +178,7 @@ select id,name,type,level,area_manage,province_id,city_id,area_id,address,descri
     <select id="queryOrganization" resultMap="OrganizationResultMap"
             parameterType="com.lyms.platform.permission.model.OrganizationQuery">
         select
-        id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id
+        id,name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode,foreign_id,street_id
         from organization
         <include refid="OrganizationCondition"/>
         <include refid="orderAndLimit"/>
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 a8e9379..2e21443 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
@@ -100,6 +100,7 @@ public class OrganizationController extends BaseController {
                                 @RequestParam(value = "provinceId", required = false) String provinceId,
                                 @RequestParam(value = "cityId", required = false) String cityId,
                                 @RequestParam(value = "areaId", required = false) String areaId,
+                                @RequestParam(value = "streetId", required = false) String streetId,
                                 @RequestParam(value = "address", required = false) String address,
                                 @RequestParam(value = "description", required = false) String description,
                                 @RequestParam(value = "shortCode", required = false) String shortCode) {
@@ -124,6 +125,7 @@ public class OrganizationController extends BaseController {
         organization.setProvinceId(provinceId);
         organization.setCityId(cityId);
         organization.setAreaId(areaId);
+        organization.setStreetId(streetId);
         organization.setAddress(address);
         organization.setDescription(description);
         organization.setShortcode(shortCode);
@@ -149,6 +151,7 @@ public class OrganizationController extends BaseController {
                                 @RequestParam(value = "provinceId") String provinceId,
                                 @RequestParam(value = "cityId") String cityId,
                                 @RequestParam(value = "areaId") String areaId,
+                                @RequestParam(value = "streetId") String streetId,
                                 @RequestParam(value = "address") String address,
                                 @RequestParam(value = "description", required = false) String description,
                                 @RequestParam(value = "shortCode", required = false) String shortCode) {
@@ -178,6 +181,7 @@ public class OrganizationController extends BaseController {
         organization.setProvinceId(provinceId);
         organization.setCityId(cityId);
         organization.setAreaId(areaId);
+        organization.setStreetId(streetId);
         organization.setAddress(address);
         organization.setDescription(description);
         organization.setShortcode(shortCode);
@@ -237,6 +241,11 @@ public class OrganizationController extends BaseController {
                     BasicConfig p2 = basicConfigService.getOneBasicConfigById(p1.getParentId());
                     if (p2 != null && SystemConfig.CHINA_BASIC_ID.equals(p2.getParentId())) {
                         organizationQuery.setAreaId(areaId);
+                    } else {
+//                        BasicConfig p3 = basicConfigService.getOneBasicConfigById(p1.getParentId());
+//                        if (p2 != null && SystemConfig.CHINA_BASIC_ID.equals(p3.getParentId())) {
+                            organizationQuery.setStreetId(areaId);
+//                        }
                     }
                 }
             }