Browse Source

【fix】:社区人房统计列表,增加customerId过滤,应对不传参数的情况。

master
wangxianzhang 3 years ago
parent
commit
390ec51fb5
  1. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
  2. 4
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
  3. 3
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@ -397,6 +397,6 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
*/ */
Integer getUsingCommunityStats(@Param("agencyId") String agencyId, @Param("agencyOrgIdPath") String agencyOrgIdPath, @Param("endDate") Date endDate); Integer getUsingCommunityStats(@Param("agencyId") String agencyId, @Param("agencyOrgIdPath") String agencyOrgIdPath, @Param("endDate") Date endDate);
List<String> getCommunitysByOrgIdPath(@Param("orgId") String orgId, @Param("orgIdPath") String orgIdPath); List<String> getCommunitysByOrgIdPath(@Param("customerId") String customerId, @Param("orgId") String orgId, @Param("orgIdPath") String orgIdPath);
} }

4
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@ -1396,8 +1396,10 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
@Override @Override
public PageData<SubUserHouseListResultDTO> communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize) { public PageData<SubUserHouseListResultDTO> communityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize) {
String customerId = EpmetRequestHolder.getLoginUserCustomerId();
PageHelper.startPage(pageNo, pageSize); PageHelper.startPage(pageNo, pageSize);
List<String> communityIds = customerAgencyDao.getCommunitysByOrgIdPath(orgId, CustomerOrgRedis.getOrgIdPath(orgId, orgType)); List<String> communityIds = customerAgencyDao.getCommunitysByOrgIdPath(customerId, orgId, CustomerOrgRedis.getOrgIdPath(orgId, orgType));
// 填充组织信息 // 填充组织信息

3
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@ -1032,7 +1032,8 @@
<select id="getCommunitysByOrgIdPath" resultType="string"> <select id="getCommunitysByOrgIdPath" resultType="string">
select ca.ID select ca.ID
from customer_agency ca from customer_agency ca
where ca.LEVEL = 'community' where ca.CUSTOMER_ID=#{customerId}
and ca.LEVEL = 'community'
and ca.DEL_FLAG = 0 and ca.DEL_FLAG = 0
and (ca.ID = #{orgId} or ca.PIDS like CONCAT(#{orgIdPath},'%')) and (ca.ID = #{orgId} or ca.PIDS like CONCAT(#{orgIdPath},'%'))
order by ca.CREATED_TIME asc order by ca.CREATED_TIME asc

Loading…
Cancel
Save