diff --git a/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java index c586277..3cae586 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java @@ -70,6 +70,7 @@ public interface AssessTeamRatingMapper extends BaseMapper { and t.rectify_status = #{obj.status} + order by t.rectify_status asc,t.rectify_last_date desc """) Page listPage(Page page,@Param("obj") AssessTaskPageSo page1); diff --git a/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java b/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java index c095801..2640070 100644 --- a/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java +++ b/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java @@ -1,6 +1,7 @@ package com.gunshi.project.xyt.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -249,6 +250,9 @@ public class OsmoticShiftRService extends ServiceImpl listValue() { List list = baseMapper.listValue(); + if(CollectionUtils.isEmpty(list)){ + return list; + } OsmoticQuerySo so = new OsmoticQuerySo(); List stationCodes = list.stream().map(OsmoticShiftListVo::getStationCode).collect(Collectors.toList()); String maxTm = list.stream().filter(o->o.getTm() != null).max(Comparator.comparing(OsmoticShiftListVo::getTm)).get().getTm();