Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java

@@ -202,7 +202,7 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService {
             //2-1.直属下级组织列表
             //2.判断客户是否存在子客户
             List<String> list = customerRelation.haveSubCustomer(dto.getCustomerId());
-            if (!CollectionUtils.isNotEmpty(list)) {
+            if (CollectionUtils.isEmpty(list)) {
                 agencyList = evaluationIndexDao.getSubAgencyListByAgency(agencyId, null, null);
             } else {
                 list.add(dto.getCustomerId());

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml

@@ -165,6 +165,11 @@
             <when test="areaCode != null and areaCode.trim() != ''">
                 AND parent_area_code = #{areaCode}
             </when>
+            <!--要孔村的党支部有啥用 还要导出排掉-->
+            <when test="agencyId == '1234085031077498881'">
+                AND PIDS like  concat(#{agencyId},'%')
+                AND LEVEL = 'community'
+            </when>
             <otherwise>
                 AND pid = #{agencyId}
             </otherwise>