小程序预约列表

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<IcPartyServ
     @Override
     public List<AppointmentRecordResultDTO> appointmentRecordMini(AppointmentRecordMiniFormDTO formDTO,TokenDto tokenDto) {
         List<AppointmentRecordResultDTO> result = matterAppointmentRecordDao.appointmentRecordMini(formDTO.getGridId(), tokenDto.getUserId());
-        if (CollectionUtils.isNotEmpty(result)){
-            return result;
+        if (CollectionUtils.isEmpty(result)){
+            return new ArrayList<>();
         }
         List<AllMattersResultDTO> allMatters = baseDao.getAllMattersByOrgId(result.stream().map(m -> m.getMatterId()).collect(Collectors.toList()));
         allMatters.forEach(matter -> {
@@ -548,7 +548,7 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
                 }
             });
         });
-        return new ArrayList<>();
+        return result;
     }
 
     /**

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 (
                 <foreach collection="matterIds" item="m" separator=",">
                     #{m}
                 </foreach>