|
|
@@ -1255,7 +1255,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
.eq(commissionInfoDto.getIndustrySector() != 0, SysPremiumDetails::getIndustrySector, commissionInfoDto.getIndustrySector())
|
|
|
.between(StringUtils.isNotEmpty(commissionInfoDto.getBeginTime()) && StringUtils.isNotEmpty(commissionInfoDto.getEndTime()),
|
|
|
SysPremiumDetails::getCreateTime, commissionInfoDto.getBeginTime(), commissionInfoDto.getEndTime())
|
|
|
- .orderByDesc(SysPremiumDetails::getId).eq(SysPremiumDetails::getStatus,0));
|
|
|
+ .orderByDesc(SysPremiumDetails::getId).eq(SysPremiumDetails::getStatus,1));
|
|
|
if (CollectionUtil.isEmpty(sysPremiumDetails)) return list;
|
|
|
|
|
|
Map<String, List<SysPremiumDetails>> listMap = sysPremiumDetails.stream().sorted(Comparator.comparing(SysPremiumDetails::getId))
|
