From 744a7eb170269bbc38a3ecdeaf9c87bbc7beb624 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 30 Jul 2024 11:30:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2087691=20=E4=B8=8D=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E9=A1=B9=E5=BA=93--=E6=9F=A5=E8=AF=A2=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=AD=97=E6=AE=B5=E5=A4=AA=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsEvaluationNotMetLibraryServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java index 9c9080ce..d0e84eb2 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java @@ -7,15 +7,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; -import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.FileUtils; import com.jero.common.util.ZipUtil; +import com.jero.modules.assessmentLibrary.entity.AssessCommon; import com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibrary; import com.jero.modules.assessmentLibrary.mapper.LawsEvaluationNotMetLibraryMapper; import com.jero.modules.assessmentLibrary.service.ILawsConformityAssessmentLibraryService; import com.jero.modules.assessmentLibrary.service.ILawsEvaluationNotMetLibraryService; import com.jero.modules.laws.utils.ExcelExportUtilPro; -import com.jero.modules.assessmentLibrary.entity.AssessCommon; import com.jero.modules.sys.utils.UserUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -57,7 +56,7 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl queryPage(LawsEvaluationNotMetLibrary lawsEvaluationNotMet, Integer pageNo, Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsEvaluationNotMet, req.getParameterMap()); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.like(StringUtils.isNotBlank(lawsEvaluationNotMet.getStandardNumber()), "nm.standard_number", lawsEvaluationNotMet.getStandardNumber()); queryWrapper.like(StringUtils.isNotBlank(lawsEvaluationNotMet.getStandardName()),