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());