diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java index 396ba3611a..cc9f2cdd8d 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java @@ -44,5 +44,5 @@ public class HomeMonthTotalFormDTO implements Serializable { */ private String agencyId; - private String path; + // private String path; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 13998520e9..639d058bf4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -122,11 +122,11 @@ public class IcPartyActServiceImpl extends BaseServiceImpl getHomeMonthTotal(HomeMonthTotalFormDTO formDTO) { CustomerStaffInfoCacheResult staffInfo = queryStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); formDTO.setAgencyId(staffInfo.getAgencyId()); - IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId()); - if (null == icPartyOrgDTO){ - throw new EpmetException("未查询到党组织信息:"+formDTO.getOrgId()); - } - formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId())); + // IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId()); + // if (null == icPartyOrgDTO){ + // throw new EpmetException("未查询到党组织信息:"+formDTO.getOrgId()); + // } + // formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId())); List result = constructMonthData(formDTO.getYearId()); List countList = scheduleDao.getScheduleAndActCount(formDTO); if (CollectionUtils.isNotEmpty(countList)){ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 8d6c2295a4..cb56d450fb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -40,7 +40,7 @@ AND PUBLISH_STAFF_ID = #{staffId} - AND PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%') + AND (PUBLISH_PARTY_ORG_ID = #{orgId} or PUBLISH_ORG_PATH LIKE CONCAT('%',#{orgId},'%')) GROUP BY HOLD_MONTH_ID)t GROUP BY t.monthId