diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java index 9edd7532..30363316 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java @@ -25,4 +25,6 @@ public interface PayMeetingMapper extends BaseMapper { IPage internelPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); IPage workGroupPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + IPage standardPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml index 8eea009f..5ddea2e1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml @@ -102,4 +102,11 @@ left join pay_working_group pwg on pwg.id = pm.working_group_id ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index e370e4b2..6b31b0ab 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -623,6 +623,13 @@ public class PayMeetingServiceImpl extends ServiceImpl a.eq("tmp.director_id", sysUser.getId()) + .or() + .eq("pm.director_id", sysUser.getId()) + ); + pageList = baseMapper.standardPage(page,queryWrapper); }else { queryWrapper.eq("director_id", sysUser.getId()); pageList = page(page, queryWrapper);