From e37d118d0cc79d13c5b4af2eabace6526445a979 Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Thu, 20 Nov 2025 18:29:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi-common/ruoyi-common-doc/pom.xml | 2 +- .../common/doc/config/SpringDocConfig.java | 9 -------- .../PgsProgressCategoryCreateReq.java | 3 --- .../controller/WgzQuestionSaveController.java | 21 +++++-------------- .../impl/HseViolationLevelServiceImpl.java | 5 +++-- 5 files changed, 9 insertions(+), 31 deletions(-) diff --git a/xinnengyuan/ruoyi-common/ruoyi-common-doc/pom.xml b/xinnengyuan/ruoyi-common/ruoyi-common-doc/pom.xml index 7d207ae9..2f0b5838 100644 --- a/xinnengyuan/ruoyi-common/ruoyi-common-doc/pom.xml +++ b/xinnengyuan/ruoyi-common/ruoyi-common-doc/pom.xml @@ -44,7 +44,7 @@ com.github.xiaoymin knife4j-openapi3-jakarta-spring-boot-starter - 4.5.0 + 4.4.0 diff --git a/xinnengyuan/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java b/xinnengyuan/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java index 59633f18..7e2e08e8 100644 --- a/xinnengyuan/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java +++ b/xinnengyuan/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java @@ -110,15 +110,6 @@ public class SpringDocConfig { } PlusPaths newPaths = new PlusPaths(); oldPaths.forEach((k, v) -> newPaths.addPathItem(finalContextPath + k, v)); - newPaths.forEach((s, pathItem) -> { - // 为所有接口添加鉴权 - pathItem.readOperations().forEach(operation -> { - operation.addSecurityItem(new SecurityRequirement() - .addList(HttpHeaders.AUTHORIZATION) - .addList("Clientid") - ); - }); - }); openApi.setPaths(newPaths); }; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/progresscategory/PgsProgressCategoryCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/progresscategory/PgsProgressCategoryCreateReq.java index 16b759cb..a517f1f3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/progresscategory/PgsProgressCategoryCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/dto/progresscategory/PgsProgressCategoryCreateReq.java @@ -49,19 +49,16 @@ public class PgsProgressCategoryCreateReq implements Serializable { /** * 计量单位 */ - @NotBlank(message = "计量单位不能为空") private String unit; /** * 综合单价(业主) */ - @NotNull(message = "综合单价(业主)不能为空") private BigDecimal ownerPrice; /** * 综合单价(分包) */ - @NotNull(message = "综合单价(分包)不能为空") private BigDecimal constructionPrice; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/WgzQuestionSaveController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/WgzQuestionSaveController.java index f9456baf..f6287b1a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/WgzQuestionSaveController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/WgzQuestionSaveController.java @@ -1,27 +1,18 @@ package org.dromara.safety.controller; -import java.util.Arrays; - import cn.dev33.satoken.annotation.SaCheckPermission; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; -import org.dromara.safety.domain.WgzQuestionSave; -import org.dromara.safety.domain.bo.WgzQuestionSaveBo; import org.dromara.safety.domain.bo.WgzQuestionSavePdfBo; import org.dromara.safety.domain.vo.WgzQuestionSavePdfVo; -import org.dromara.safety.domain.vo.WgzQuestionSaveVo; import org.dromara.safety.service.IWgzQuestionSavePdfService; -import org.dromara.safety.service.IWgzQuestionSaveService; -import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * 用户试卷存储Controller * @@ -34,8 +25,6 @@ import org.springframework.validation.annotation.Validated; @RequestMapping("/safety/wgzQuestionSave") public class WgzQuestionSaveController extends BaseController { - private final IWgzQuestionSaveService iWgzQuestionSaveService; - private final IWgzQuestionSavePdfService iwgzQuestionSavePdfService; /** @@ -44,7 +33,7 @@ public class WgzQuestionSaveController extends BaseController { @SaCheckPermission("safety:wgzQuestionSave:listPdf") @GetMapping("/listPdf") public TableDataInfo list(@Validated WgzQuestionSavePdfBo bo, PageQuery pageQuery) { - return iwgzQuestionSavePdfService.queryPageList(bo,pageQuery); + return iwgzQuestionSavePdfService.queryPageList(bo, pageQuery); } // /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationLevelServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationLevelServiceImpl.java index 8fca0703..2bdc0557 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationLevelServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationLevelServiceImpl.java @@ -388,13 +388,14 @@ public class HseViolationLevelServiceImpl extends ServiceImpl + wrapper.likeRight(HseViolationLevel::getViolationType, violationType + ",") .or() .likeLeft(HseViolationLevel::getViolationType, "," + violationType) .or() .like(HseViolationLevel::getViolationType, "," + violationType + ",") .or() - .eq(HseViolationLevel::getViolationType, violationType); + .eq(HseViolationLevel::getViolationType, violationType)); } return lqw; }