|
@@ -83,7 +83,6 @@ public class DemMicroStationServiceImpl extends AbstractCrudService<DemMicroStat
|
|
queryWrapper.select(DemMicroStation::getSquadron)
|
|
queryWrapper.select(DemMicroStation::getSquadron)
|
|
.eq(DemMicroStation::getDeleteFlag, "0")
|
|
.eq(DemMicroStation::getDeleteFlag, "0")
|
|
.eq(StringUtils.isNotBlank(branchName), DemMicroStation::getBranchName, branchName)
|
|
.eq(StringUtils.isNotBlank(branchName), DemMicroStation::getBranchName, branchName)
|
|
- .orderByDesc(DemMicroStation::getId)
|
|
|
|
.groupBy(DemMicroStation::getSquadron);
|
|
.groupBy(DemMicroStation::getSquadron);
|
|
List<DemMicroStation> list1 = this.list(queryWrapper);
|
|
List<DemMicroStation> list1 = this.list(queryWrapper);
|
|
if (CollectionUtils.isNotEmpty(list1)) {
|
|
if (CollectionUtils.isNotEmpty(list1)) {
|