Commit 88639683 authored by tianbo's avatar tianbo

检查报告对应bug修改

parent 2c3d8f42
......@@ -2152,10 +2152,12 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
}
lambdaQueryWrapper.le(LatentDanger::getCreateDate, searchParam.getEndTime());
}
lambdaQueryWrapper.and(o ->
o.likeRight(LatentDanger::getOrgCode, searchParam.getOrgCode() + "*")
.or().likeRight(LatentDanger::getOrgCode, searchParam.getOrgCode() + "-")
.or().eq(LatentDanger::getOrgCode, searchParam.getOrgCode()));
if (ValidationUtil.isEmpty(searchParam.getDangerIds())) {
lambdaQueryWrapper.and(o ->
o.likeRight(LatentDanger::getOrgCode, searchParam.getOrgCode() + "*")
.or().likeRight(LatentDanger::getOrgCode, searchParam.getOrgCode() + "-")
.or().eq(LatentDanger::getOrgCode, searchParam.getOrgCode()));
}
List<LatentDanger> latentDangerList = this.baseMapper.selectList(lambdaQueryWrapper);
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