Commit 7638d8a2 authored by hongguangwu's avatar hongguangwu

MVP1.7.9-去除空

parent 3c8571cd
...@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain; import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
...@@ -2195,7 +2196,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2195,7 +2196,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
while (true) { while (true) {
pageInfo = new Page<>(page, pageSize); pageInfo = new Page<>(page, pageSize);
batch = socialFundInfoMapper.selectPage(pageInfo, batch = socialFundInfoMapper.selectPage(pageInfo,
Wrappers.<TSocialFundInfo>query().lambda()).getRecords(); Wrappers.<TSocialFundInfo>query().lambda()
.and(obj -> obj.isNotNull(TSocialFundInfo::getSettleDomainCode)
.or()
.isNotNull(TSocialFundInfo::getSettleDomainCodeFund)
)
).getRecords();
if (batch == null || batch.isEmpty()) { if (batch == null || batch.isEmpty()) {
break; // 明确退出条件 break; // 明确退出条件
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment