From 72a458f6c6bbd1890b8c7258a9689fcaf338b3f6 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 25 Jun 2024 13:50:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E8=AF=84=E4=BC=B0=E5=BA=93=E5=A2=9E=E5=8A=A0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=9D=83=E9=99=90=E5=8F=8A=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LawsConformityAssessmentController.java | 5 ++++- .../impl/LawsConformityAssessmentLibraryServiceImpl.java | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsConformityAssessmentController.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsConformityAssessmentController.java index a91f1c85..d70db001 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsConformityAssessmentController.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsConformityAssessmentController.java @@ -1,6 +1,7 @@ package com.jero.modules.assessmentLibrary.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary; @@ -8,6 +9,7 @@ import com.jero.modules.assessmentLibrary.service.ILawsConformityAssessmentLibra import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -35,7 +37,8 @@ public class LawsConformityAssessmentController { @AutoLog(value = "法规符合性评估库-法规符合性评估库-分页列表查询") @ApiOperation(value = "法规符合性评估库-法规符合性评估库-分页列表查询", notes = "法规符合性评估库-法规符合性评估库-分页列表查询") @GetMapping(value = "/page") -// @RequiresPermissions("") + @ApiOperationSupport(order = 1) + @RequiresPermissions("lawsConformityAssessment:search") public Result> queryPageList(LawsConformityAssessmentLibrary lawsConformityAssessmentLibrary, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java index cd2bcb99..9d4d57f4 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java @@ -35,11 +35,11 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); Page page = new Page<>(pageNo, pageSize); queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardNumber()), - STANDARD_NUMBER, lawsConformityAssessmentLibrary.getStandardNumber()); + "d.standard_number", lawsConformityAssessmentLibrary.getStandardNumber()); queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardName()), - STANDARD_NAME, lawsConformityAssessmentLibrary.getStandardName()); - queryWrapper.eq(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardName()), - STANDARD_NAME, lawsConformityAssessmentLibrary.getStandardName()); + "d.standard_name", lawsConformityAssessmentLibrary.getStandardName()); + queryWrapper.eq(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getApplicableMarket()), + "d.applicable_market", lawsConformityAssessmentLibrary.getApplicableMarket()); queryWrapper.between(lawsConformityAssessmentLibrary.getValuationTime() != null, "valuation_time", lawsConformityAssessmentLibrary.getStartValuationTime(), lawsConformityAssessmentLibrary.getEndValuationTime()); queryWrapper.orderByDesc("cs.create_time");