diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicCmtyController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicCmtyController.java
index 7df1a7c..f95667a 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicCmtyController.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McBasicCmtyController.java
@@ -58,6 +58,37 @@ public class McBasicCmtyController extends BaseController {
 
 
     /**
+     * 查询小区
+     * @param fiscalYear
+     * @param regionName
+     * @param groupName
+     * @param companyName
+     * @param companyCode
+     * @return
+     */
+    @RequirePermission("schsf:mcBasicCmty:vlgOrCmty")
+    @GetMapping("/vlgOrCmty")
+    public AjaxResult vlgOrCmty(
+            @RequestParam(value = "fiscalYear", required = true) Long fiscalYear,
+            @RequestParam(value = "regionName", required = true) String regionName,
+            @RequestParam(value = "groupName", required = true) String groupName,
+            @RequestParam(value = "companyName", required = true) String companyName,
+            @RequestParam(value = "companyCode", required = true) String companyCode) {
+        McBasicCmtyVo mcBasicCmtyVo = new McBasicCmtyVo();
+        mcBasicCmtyVo.setDefFlag("0");
+        mcBasicCmtyVo.setFiscalYear(fiscalYear);
+        mcBasicCmtyVo.setRegionName(regionName);
+        mcBasicCmtyVo.setGroupName(groupName);
+        mcBasicCmtyVo.setCompanyName(companyName);
+        mcBasicCmtyVo.setCompanyCode(companyCode);
+        List<McBasicCmty> data = mcBasicCmtyService.selectVlgOrCmtyList(mcBasicCmtyVo);
+        return AjaxResult.success(data);
+    }
+
+
+
+
+    /**
      * 查询基础数据-户数列表
      */
     @RequirePermission("schsf:mcBasicCmty:list")
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicCmtyMapper.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicCmtyMapper.java
index 6d6f63f..9874639 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicCmtyMapper.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/mapper/McBasicCmtyMapper.java
@@ -67,4 +67,7 @@ public interface McBasicCmtyMapper
     List<CompanyDto> getDistinctGroupList(McBasicCmtyVo mcBasicCmtyVo);
 
     List<CompanyDto> getDistinctCompanyList(McBasicCmtyVo mcBasicCmtyVo);
+
+    List<McBasicCmty> selectVlgOrCmtyList(McBasicCmtyVo mcBasicCmtyVo);
+
 }
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcBasicCmtyService.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcBasicCmtyService.java
index 491c139..e2894c6 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcBasicCmtyService.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcBasicCmtyService.java
@@ -70,6 +70,10 @@ public interface IMcBasicCmtyService
     List<CompanyDto> selectCompanyCascader(McBasicCmtyVo mcBasicCmtyVo);
 
 
-
-
+    /**
+     * 查询小区
+     * @param mcBasicCmtyVo
+     * @return
+     */
+    List<McBasicCmty> selectVlgOrCmtyList(McBasicCmtyVo mcBasicCmtyVo);
 }
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicCmtyServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicCmtyServiceImpl.java
index 9e0348b..64561dd 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicCmtyServiceImpl.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McBasicCmtyServiceImpl.java
@@ -120,6 +120,16 @@ public class McBasicCmtyServiceImpl implements IMcBasicCmtyService
         return companyDtos;
     }
 
+    /**
+     * 查询小区
+     * @param mcBasicCmtyVo
+     * @return
+     */
+    @Override
+    public List<McBasicCmty> selectVlgOrCmtyList(McBasicCmtyVo mcBasicCmtyVo) {
+        return mcBasicCmtyMapper.selectVlgOrCmtyList(mcBasicCmtyVo);
+    }
+
     private List<CompanyDto> loadDistinctGroups(McBasicCmtyVo mcBasicCmtyVo, CompanyDto parent) {
         mcBasicCmtyVo.setRegionName(parent.getValue());
         return mcBasicCmtyMapper.getDistinctGroupList(mcBasicCmtyVo);
diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml
index 3101df1..635ff57 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/resources/mapper/McBasicCmtyMapper.xml
@@ -283,7 +283,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_user u on u.user_id = t.create_by
         left join sys_dept d on d.dept_id = t.company_code
         WHERE 1=1
-        <if test="regionName != null  and regionName != ''"> and region_name = #{regionName}</if>
+        <if test="regionName != null  and regionName != ''"> and t.region_name = #{regionName}</if>
         <if test="defFlag != null  and defFlag != ''"> and t.def_flag = #{defFlag}</if>
         <if test="fiscalYear != null "> and t.fiscal_year = #{fiscalYear}</if>
         <!-- 数据范围过滤 -->
@@ -299,10 +299,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join sys_dept d on d.dept_id = t.company_code
         WHERE 1 = 1
         <if test="groupName != null  and groupName != ''">
-            and group_name = #{groupName}
+            and t.group_name = #{groupName}
         </if>
         <if test="regionName != null  and regionName != ''">
-            and region_name = #{regionName}
+            and t.region_name = #{regionName}
         </if>
         <if test="defFlag != null  and defFlag != ''">
             and t.def_flag = #{defFlag}
@@ -313,4 +313,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
+
+    <select id="selectVlgOrCmtyList" resultMap="McBasicCmtyResult" parameterType="com.chinagas.modules.schsf.domain.vo.McBasicCmtyVo">
+        SELECT DISTINCT t.vlg_or_cmty
+        FROM mc_basic_cmty t
+                 left join sys_user u on u.user_id = t.create_by
+                 left join sys_dept d on d.dept_id = t.company_code
+        WHERE 1 = 1
+        <if test="groupName != null  and groupName != ''">
+            and t.group_name = #{groupName}
+        </if>
+        <if test="regionName != null  and regionName != ''">
+            and t.region_name = #{regionName}
+        </if>
+        <if test="defFlag != null  and defFlag != ''">
+            and t.def_flag = #{defFlag}
+        </if>
+        <if test="fiscalYear != null">
+            and t.fiscal_year = #{fiscalYear}
+        </if>
+        <if test="companyName != null  and companyName != ''">
+            and t.company_name = #{companyName}
+        </if>
+        <if test="companyCode != null  and companyCode != ''">
+            and t.company_code = #{companyCode}
+        </if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
 </mapper>
--
libgit2 0.21.2