diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java
index 4773b482..c517499a 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java
@@ -93,41 +93,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                    HttpServletRequest req) {
         payMeeting.setMeetingType(MeetingCommon.COMMITTEE_MEETING_INT);
-        QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
-        String meetingStartTime = req.getParameter("meetingStartTime");
-        String meetingEndTime = req.getParameter("meetingEndTime");
-        if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) {
-            queryWrapper.not(
-                    a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime)
-            );
-        } else if (ObjectUtil.isNotEmpty(meetingStartTime)) {
-            queryWrapper.not(
-                    a -> a.lt("end_time", meetingStartTime)
-            );
-        } else if (ObjectUtil.isNotEmpty(meetingEndTime)) {
-            queryWrapper.not(
-                    a -> a.gt("start_time", meetingEndTime)
-            );
-        }
-
-        Page<PayMeeting> page = new Page<>(pageNo, pageSize);
-        IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
-        for (PayMeeting meeting : pageList.getRecords()) {
-            //查询会议负责人
-            LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
-            
-            meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
-            meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
-            PayMeetingVO payMeetingVO = new PayMeetingVO();
-            BeanUtils.copyProperties(payMeetingVO, payMeeting);
-            //查询酒店联系人列表
-            if (meeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
-                LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(PayMeetingHotelContacts::getMeetingId, meeting.getId());
-                List<PayMeetingHotelContacts> payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper);
-                meeting.setHotelContactsList(payMeetingHotelContactsList);
-            }
-        }
+        IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req);
 
         return Result.OK(pageList);
     }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java
index 9c5e2ca3..868fc4ee 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java
@@ -93,40 +93,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                    HttpServletRequest req) {
         payMeeting.setMeetingType(MeetingCommon.INTERNATIONAL_MEETING_INT);
-        QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
-        String meetingStartTime = req.getParameter("meetingStartTime");
-        String meetingEndTime = req.getParameter("meetingEndTime");
-        if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) {
-            queryWrapper.not(
-                    a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime)
-            );
-        } else if (ObjectUtil.isNotEmpty(meetingStartTime)) {
-            queryWrapper.not(
-                    a -> a.lt("end_time", meetingStartTime)
-            );
-        } else if (ObjectUtil.isNotEmpty(meetingEndTime)) {
-            queryWrapper.not(
-                    a -> a.gt("start_time", meetingEndTime)
-            );
-        }
-
-        Page<PayMeeting> page = new Page<>(pageNo, pageSize);
-        IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
-        for (PayMeeting meeting : pageList.getRecords()) {
-            //查询会议负责人
-            LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
-            meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
-            meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
-            PayMeetingVO payMeetingVO = new PayMeetingVO();
-            BeanUtils.copyProperties(payMeetingVO, payMeeting);
-            //查询酒店联系人列表
-            if (meeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
-                LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(PayMeetingHotelContacts::getMeetingId, meeting.getId());
-                List<PayMeetingHotelContacts> payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper);
-                meeting.setHotelContactsList(payMeetingHotelContactsList);
-            }
-        }
+        IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req);
 
         return Result.OK(pageList);
     }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java
index 7006663a..25821ae9 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java
@@ -93,41 +93,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                    HttpServletRequest req) {
         payMeeting.setMeetingType(MeetingCommon.OTHER_MEETING_INT);
-        QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
-        String meetingStartTime = req.getParameter("meetingStartTime");
-        String meetingEndTime = req.getParameter("meetingEndTime");
-        if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) {
-            queryWrapper.not(
-                    a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime)
-            );
-        } else if (ObjectUtil.isNotEmpty(meetingStartTime)) {
-            queryWrapper.not(
-                    a -> a.lt("end_time", meetingStartTime)
-            );
-        } else if (ObjectUtil.isNotEmpty(meetingEndTime)) {
-            queryWrapper.not(
-                    a -> a.gt("start_time", meetingEndTime)
-            );
-        }
-
-        Page<PayMeeting> page = new Page<>(pageNo, pageSize);
-        IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
-        for (PayMeeting meeting : pageList.getRecords()) {
-            //查询会议负责人
-            LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
-            
-            meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
-            meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
-            PayMeetingVO payMeetingVO = new PayMeetingVO();
-            BeanUtils.copyProperties(payMeetingVO, payMeeting);
-            //查询酒店联系人列表
-            if (meeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
-                LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(PayMeetingHotelContacts::getMeetingId, meeting.getId());
-                List<PayMeetingHotelContacts> payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper);
-                meeting.setHotelContactsList(payMeetingHotelContactsList);
-            }
-        }
+        IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req);
 
         return Result.OK(pageList);
     }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
index a9c3fee6..6ba41afc 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
@@ -97,40 +97,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                    HttpServletRequest req) {
-        QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
-        String meetingStartTime = req.getParameter("meetingStartTime");
-        String meetingEndTime = req.getParameter("meetingEndTime");
-        if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) {
-            queryWrapper.not(
-                    a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime)
-            );
-        } else if (ObjectUtil.isNotEmpty(meetingStartTime)) {
-            queryWrapper.not(
-                    a -> a.lt("end_time", meetingStartTime)
-            );
-        } else if (ObjectUtil.isNotEmpty(meetingEndTime)) {
-            queryWrapper.not(
-                    a -> a.gt("start_time", meetingEndTime)
-            );
-        }
-
-        Page<PayMeeting> page = new Page<>(pageNo, pageSize);
-        IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
-        for (PayMeeting meeting : pageList.getRecords()) {
-            //查询会议负责人
-            LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
-            meeting.setDirectorName(user.getRealname());
-            meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
-            PayMeetingVO payMeetingVO = new PayMeetingVO();
-            BeanUtils.copyProperties(payMeetingVO, payMeeting);
-            //查询酒店联系人列表
-            if (meeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
-                LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(PayMeetingHotelContacts::getMeetingId, meeting.getId());
-                List<PayMeetingHotelContacts> payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper);
-                meeting.setHotelContactsList(payMeetingHotelContactsList);
-            }
-        }
+        IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req);
 
         return Result.OK(pageList);
     }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java
index 91109648..282be2b9 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java
@@ -93,41 +93,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                    HttpServletRequest req) {
         payMeeting.setMeetingType(MeetingCommon.STANDARD_MEETING_INT);
-        QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
-        String meetingStartTime = req.getParameter("meetingStartTime");
-        String meetingEndTime = req.getParameter("meetingEndTime");
-        if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) {
-            queryWrapper.not(
-                    a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime)
-            );
-        } else if (ObjectUtil.isNotEmpty(meetingStartTime)) {
-            queryWrapper.not(
-                    a -> a.lt("end_time", meetingStartTime)
-            );
-        } else if (ObjectUtil.isNotEmpty(meetingEndTime)) {
-            queryWrapper.not(
-                    a -> a.gt("start_time", meetingEndTime)
-            );
-        }
-
-        Page<PayMeeting> page = new Page<>(pageNo, pageSize);
-        IPage<PayMeeting> pageList = payMeetingService.page(page, queryWrapper);
-        for (PayMeeting meeting : pageList.getRecords()) {
-            //查询会议负责人
-            LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
-            
-            meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")");
-            meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
-            PayMeetingVO payMeetingVO = new PayMeetingVO();
-            BeanUtils.copyProperties(payMeetingVO, payMeeting);
-            //查询酒店联系人列表
-            if (meeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
-                LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(PayMeetingHotelContacts::getMeetingId, meeting.getId());
-                List<PayMeetingHotelContacts> payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper);
-                meeting.setHotelContactsList(payMeetingHotelContactsList);
-            }
-        }
+        IPage<PayMeeting> pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req);
 
         return Result.OK(pageList);
     }