From b8341a9d8c2fc9ce63de9c8044b14dc76ed42ce4 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 17 Nov 2025 11:22:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=96=B9=E6=A1=88=E5=BA=93?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/web/service/enterprise/ToolService.java | 1 + .../com/bonus/common/domain/mainDatabase/dto/ToolDto.java | 4 ++-- .../src/main/resources/mapper/TechnicalMapper.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bonus-admin/src/main/java/com/bonus/web/service/enterprise/ToolService.java b/bonus-admin/src/main/java/com/bonus/web/service/enterprise/ToolService.java index fc72d85..98a7585 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/enterprise/ToolService.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/enterprise/ToolService.java @@ -257,6 +257,7 @@ public class ToolService { } } catch (Exception e) { log.error(e.toString(), e); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error(e.getMessage()); } return AjaxResult.success(); diff --git a/bonus-common/src/main/java/com/bonus/common/domain/mainDatabase/dto/ToolDto.java b/bonus-common/src/main/java/com/bonus/common/domain/mainDatabase/dto/ToolDto.java index b629ff4..2360a6c 100644 --- a/bonus-common/src/main/java/com/bonus/common/domain/mainDatabase/dto/ToolDto.java +++ b/bonus-common/src/main/java/com/bonus/common/domain/mainDatabase/dto/ToolDto.java @@ -106,8 +106,8 @@ public class ToolDto { /** * 资源文件 */ - @NotEmpty(message = "文件不能为空", groups = {TechnicalDto.TechnicalDataDto.ADD.class}) - @Size(min = 1,message = "最少上传一个文件", groups = {TechnicalDto.TechnicalDataDto.ADD.class}) + @NotEmpty(message = "文件不能为空", groups = {ADD.class,IMPORT.class}) + @Size(min = 1,message = "最少上传一个文件", groups = {ADD.class,IMPORT.class}) private List files; /**删除的文件*/ diff --git a/bonus-mainDatabase/src/main/resources/mapper/TechnicalMapper.xml b/bonus-mainDatabase/src/main/resources/mapper/TechnicalMapper.xml index 3539a37..bf75ef9 100644 --- a/bonus-mainDatabase/src/main/resources/mapper/TechnicalMapper.xml +++ b/bonus-mainDatabase/src/main/resources/mapper/TechnicalMapper.xml @@ -142,7 +142,7 @@ INSTR(tets.technical_name,#{technicalName}) > 0 - AND tets.nature_construction = #{natureConstruction} + AND FIND_IN_SET(#{natureConstruction}, tets.nature_construction) > 0 AND tets.structural_form = #{structuralForm}