helixiao 1 سال پیش
والد
کامیت
1e4a71a201

+ 4 - 3
src/main/java/com/ydtech/modules/admin/service/impl/SysPartnerServiceImpl.java

@@ -1394,12 +1394,13 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
     public BasePageResult<SysPremiumDetailsVo> getCommissionInfo(CommissionInfoDto commissionInfoDto) {
         List<SysPremiumDetailsVo> list = new ArrayList<>();
         String userId = BaseController.getUserId();
+        int pageNum = commissionInfoDto.getPageNum();
         //int offset = (page - 1) * size;
         commissionInfoDto.setPageNum( (commissionInfoDto.getPageNum() -1) * commissionInfoDto.getPageSize());
 
         List<Map<String, Object>> stringObjectList = sysPremiumDetailsMapper.queryInfoPage(userId, commissionInfoDto);
 
-        if (CollectionUtil.isEmpty(stringObjectList)) return new BasePageResult<>(commissionInfoDto.getPageNum(), commissionInfoDto.getPageSize(), 0L, 0L,
+        if (CollectionUtil.isEmpty(stringObjectList)) return new BasePageResult<>(pageNum, commissionInfoDto.getPageSize(), 0L, 0L,
                 list);
         Map<String, List<SysPremiumDetails>> listMap = new HashMap<>();
         for (Map<String, Object> stringObjectMap : stringObjectList) {
@@ -1472,8 +1473,8 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         }
 
 //        List<SysPremiumDetailsVo> collect = list.stream().limit(page.getSize()).collect(Collectors.toList());
-        long l = (list.size()+commissionInfoDto.getPageNum()-1)/commissionInfoDto.getPageSize();
-        return new BasePageResult<>(commissionInfoDto.getPageNum(), commissionInfoDto.getPageSize(), list.size(), l,
+        long l = (list.size()+pageNum-1)/commissionInfoDto.getPageSize();
+        return new BasePageResult<>(pageNum, commissionInfoDto.getPageSize(), list.size(), l,
                 list);
     }
 

+ 1 - 1
src/main/resources/mapper/modules/admin/SysPremiumDetailsMapper.xml

@@ -47,7 +47,7 @@
 
     </select>
     <sql id="setGroupConcatMaxLen">
-        SET SESSION group_concat_max_len = 10000;
+        SET SESSION group_concat_max_len = 100000;
     </sql>
     <select id="queryInfoPage" resultType="java.util.Map">
         <include refid="setGroupConcatMaxLen"/>