From 8baf7f5c13c01c9ffd9823a8507e4983106d2942 Mon Sep 17 00:00:00 2001 From: song-cc-rock Date: Mon, 4 Mar 2024 16:51:01 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AD=97=E6=AE=B5=E8=A2=AB=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1036737 --user=宋昌昌 【缺陷管理】查看缺陷管理模块失败 https://www.tapd.cn/55049933/s/1468807 --- .../java/io/metersphere/system/service/BaseTemplateService.java | 2 +- .../io/metersphere/system/service/PlatformPluginService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java index ac6a0c0390..82df2f0973 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java @@ -114,7 +114,7 @@ public class BaseTemplateService { // 封装自定义字段信息 List fieldDTOS = templateCustomFields.stream() - .filter(i -> !BooleanUtils.isTrue(i.getSystemField())) + .filter(i -> !BooleanUtils.isTrue(i.getSystemField()) && fieldMap.containsKey(i.getFieldId())) .sorted(Comparator.comparingInt(TemplateCustomField::getPos)) .map(i -> { CustomField customField = fieldMap.get(i.getFieldId()); diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/PlatformPluginService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/PlatformPluginService.java index bd941c31fa..f3795b1d38 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/PlatformPluginService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/PlatformPluginService.java @@ -54,4 +54,4 @@ public class PlatformPluginService { public List getOrgEnabledPlatformPlugins(String orgId) { return basePluginService.getOrgEnabledPlugins(orgId, PluginScenarioType.PLATFORM); } -} +} \ No newline at end of file