fix 79986 项目合规评估流程-标准选择弹窗，查询条件失效

2024-01-31 11:20:35 +08:00
parent c6d95d5581
commit 29e40b3b3b
3 changed files with 35 additions and 3 deletions
@@ -64,7 +64,15 @@ public class LawsAssessServiceImpl extends ServiceImpl<LawsAssessMapper, LawsAss
    public IPage<LawsAssess> queryPage(LawsAssess lawsAssess, Integer pageNo, Integer pageSize,
                        HttpServletRequest req) {
        QueryWrapper<LawsAssess> queryWrapper = QueryGenerator.initQueryWrapper(lawsAssess, req.getParameterMap());
-        Page<LawsAssess> page = new Page<>(pageNo, pageSize);
+		String standardNumberOrName = lawsAssess.getStandardNumberOrName();
+		if (StringUtils.isNotBlank(standardNumberOrName)){
+			queryWrapper.lambda().and(i->{
+				i.like(LawsAssess::getStandardName,standardNumberOrName)
+						.or()
+						.like(LawsAssess::getStandardNumber,standardNumberOrName);
+			});
+		}
+		Page<LawsAssess> page = new Page<>(pageNo, pageSize);
        return page(page, queryWrapper);
    }