From 9112f70f645d3521fa490e648cdce70b9a7254f0 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 27 七月 2022 17:12:36 +0800
Subject: [PATCH] fix

---
 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/RewardPunishmentDetailServiceImpl.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/RewardPunishmentDetailServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/RewardPunishmentDetailServiceImpl.java
index 481ac94..9ce657c 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/RewardPunishmentDetailServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/RewardPunishmentDetailServiceImpl.java
@@ -37,18 +37,18 @@
     public ResultVO queryAll(PageQuery<RewardPunishmentDetailQueryCriteria> pageQuery) {
         Long pageIndex = pageQuery.getPageIndex();
         Long pageSize = pageQuery.getPageSize();
-        IPage<RewardPunishmentDetail> page = new Page<>(pageIndex, pageSize);
+        IPage<RewardPunishmentDetailDto> page = new Page<>(pageIndex, pageSize);
 
-        page = baseMapper.selectPage(page,
-                QueryHelpPlus.getPredicate(RewardPunishmentDetail.class, pageQuery.getSearchParams()));
-        List<RewardPunishmentDetailDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), RewardPunishmentDetailDto.class);
+        page = baseMapper.queryAll(page,
+                pageQuery.getSearchParams().getPersonId());
+//        List<RewardPunishmentDetailDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), RewardPunishmentDetailDto.class);
 
         return new SearchResultVO<>(
                 true,
                 pageIndex,
                 pageSize,
                 page.getTotal(),
-                respList,
+                page.getRecords(),
                 ResultCodes.OK
         );
     }

--
Gitblit v1.9.2