From 73d80358d53ad994de9996f95dfac77a12bd4162 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 5 Aug 2024 09:24:45 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=A0=87=E5=8D=8F=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/service/ITbMemberProjectSubitemService.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java index ee6572f3..2774ad6e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java @@ -613,11 +613,18 @@ public class ITbMemberProjectSubitemService extends ServiceImpl generateQueryWrapper(HttpServletRequest request, TbMemberProjectSubitem tbMemberProjectSubitem){ - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, request.getParameterMap()); + Map parameterMap = request.getParameterMap(); + String[] strings = parameterMap.get("companyName"); + parameterMap.remove("companyName"); + tbMemberProjectSubitem.setCompanyName(null); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, parameterMap); String invalidationDateStr = tbMemberProjectSubitem.getInvalidationDateStr(); String effectiveDateStr = tbMemberProjectSubitem.getEffectiveDateStr(); String estimatedArrivalDateBegin = tbMemberProjectSubitem.getEstimatedArrivalDate_begin(); String estimatedArrivalDateEnd = tbMemberProjectSubitem.getEstimatedArrivalDate_end(); + if (strings != null){ + queryWrapper.like("pcm.company_name",strings[0]); + } if (StringUtils.isNotBlank(invalidationDateStr)){ DateTime invalidationDate = DateUtil.parse(invalidationDateStr, DatePattern.NORM_MONTH_PATTERN); queryWrapper.eq("year(invalidation_date)",invalidationDate.year());