From d144d086a2ecbbb4baecebba4f0ff7de91cf57e1 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 2 Dec 2025 18:27:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=B7=A5=E5=85=B7=E5=BA=93=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97=E6=90=9C=E7=B4=A2=E6=97=B6=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1547764700250112]自定义工具库管理页关键字搜索时报错 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1547764700250112 --- .../framework/autoexec/dao/mapper/AutoexecScriptMapper.xml | 2 +- .../neatlogic/framework/autoexec/dto/AutoexecOperationVo.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecScriptMapper.xml b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecScriptMapper.xml index 00f2a0c3..bccc4ce4 100644 --- a/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecScriptMapper.xml +++ b/src/main/java/neatlogic/framework/autoexec/dao/mapper/AutoexecScriptMapper.xml @@ -880,7 +880,7 @@ (select `name` from `autoexec_type` where a.`type_id` = `id`) as typeName, (select `name` from `autoexec_risk` where a.`risk_id` = `id`) as riskName, (select `color` from `autoexec_risk` where a.`risk_id` = `id`) as riskColor, - (select `id` from `autoexec_script_version` where a.`id` = `script_id` and `status` = 'submitted') as submittedVersionId, + (select `id` from `autoexec_script_version` where a.`id` = `script_id` and `status` = 'submitted' order by `id` limit 1) as submittedVersionId, a.`catalog_id` as catalogId from `autoexec_script` a diff --git a/src/main/java/neatlogic/framework/autoexec/dto/AutoexecOperationVo.java b/src/main/java/neatlogic/framework/autoexec/dto/AutoexecOperationVo.java index 8ea09dcd..d5478a89 100644 --- a/src/main/java/neatlogic/framework/autoexec/dto/AutoexecOperationVo.java +++ b/src/main/java/neatlogic/framework/autoexec/dto/AutoexecOperationVo.java @@ -233,7 +233,7 @@ public class AutoexecOperationVo extends AutoexecOperationBaseVo { } public String getIsLibName() { - if (StringUtils.isBlank(isLibName)) { + if (StringUtils.isBlank(isLibName) && isLib != null) { return isLib == 1 ? "是" : "否"; } return isLibName; -- Gitee