diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java index 822c27d926..4cd1e6dc3d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java @@ -531,8 +531,8 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl appointmentRecordMini(AppointmentRecordMiniFormDTO formDTO,TokenDto tokenDto) { List result = matterAppointmentRecordDao.appointmentRecordMini(formDTO.getGridId(), tokenDto.getUserId()); - if (CollectionUtils.isNotEmpty(result)){ - return result; + if (CollectionUtils.isEmpty(result)){ + return new ArrayList<>(); } List allMatters = baseDao.getAllMattersByOrgId(result.stream().map(m -> m.getMatterId()).collect(Collectors.toList())); allMatters.forEach(matter -> { @@ -548,7 +548,7 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl(); + return result; } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPartyServiceCenterDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPartyServiceCenterDao.xml index 190eb1f0d3..97f5e43cbf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPartyServiceCenterDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPartyServiceCenterDao.xml @@ -111,7 +111,7 @@ cm.end_time FROM ic_party_service_center_matter cm where cm.DEL_FLAG = 0 - AND cm.MATTER_ID in ( + AND cm.ID in ( #{m}