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 00f2a0c38d2382c4190017c468efc496fc5bb66b..bccc4ce45642571ef8e77ae772db3022a5ca6cf3 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 8ea09dcdd52018d05d2311af6be40d3864d20f5f..d5478a89bbadd7c928eabcd6de560a321a23c502 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;