Skip to content

A
amos-boot-biz
Commit 74361fbb authored by chenhao's avatar chenhao
Browse files
Options

Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

parents 86aba036 88639683
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java
View file @ 74361fbb
...@@ -2152,10 +2152,12 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -2152,10 +2152,12 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
} }
lambdaQueryWrapper.le(LatentDanger::getCreateDate, searchParam.getEndTime()); lambdaQueryWrapper.le(LatentDanger::getCreateDate, searchParam.getEndTime());
} }
lambdaQueryWrapper.and(o -> if (ValidationUtil.isEmpty(searchParam.getDangerIds())) {
o.likeRight(LatentDanger::getOrgCode, searchParam.getOrgCode() + "*") lambdaQueryWrapper.and(o ->
.or().likeRight(LatentDanger::getOrgCode, searchParam.getOrgCode() + "-") o.likeRight(LatentDanger::getOrgCode, searchParam.getOrgCode() + "*")
.or().eq(LatentDanger::getOrgCode, searchParam.getOrgCode())); .or().likeRight(LatentDanger::getOrgCode, searchParam.getOrgCode() + "-")
.or().eq(LatentDanger::getOrgCode, searchParam.getOrgCode()));
}
List<LatentDanger> latentDangerList = this.baseMapper.selectList(lambdaQueryWrapper); List<LatentDanger> latentDangerList = this.baseMapper.selectList(lambdaQueryWrapper);
if (!ValidationUtil.isEmpty(latentDangerList)) { if (!ValidationUtil.isEmpty(latentDangerList)) {
// 防火监督报告用该字段（复核执行人名称） // 防火监督报告用该字段（复核执行人名称）
......
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