From 669d72beac32e169fd2b43c38417becdccd3f0ba Mon Sep 17 00:00:00 2001 From: Tom Li Date: Mon, 29 Dec 2025 17:58:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6id=E6=98=AF=E7=A9=BA=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/LauncherConstant.java | 4 ++-- .../desk/basic/mapper/TeamSetMapper.java | 2 +- .../desk/basic/mapper/WorkCenterMapper.java | 2 +- .../desk/quality/service/CycleTestItemService2.java | 13 ++++++++----- .../quality/service/CycleTestStandardService2.java | 11 +++++++---- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 2b48585..ae76ab6 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -14,9 +14,9 @@ public interface LauncherConstant { */ // String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; // 生产环境 - String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; +// String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; // 测试环境 -// String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; + String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; /** * nacos 用户名 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java index 4f7ed3f..d60e0d1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java @@ -20,7 +20,7 @@ import java.util.List; * @author Tom Shuo * @since 2025-12-16 */ -public interface TeamSetMapper extends EnBaseMapper { +public interface TeamSetMapper extends BaseMapper { /** * 自定义分页 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java index 929c58c..d9424e2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java @@ -20,7 +20,7 @@ import java.util.List; * @author Tom Shuo * @since 2025-12-16 */ -public interface WorkCenterMapper extends EnBaseMapper { +public interface WorkCenterMapper extends BaseMapper { /** * 自定义分页 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestItemService2.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestItemService2.java index 990376d..3b57bfe 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestItemService2.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestItemService2.java @@ -14,6 +14,7 @@ import org.springblade.desk.quality.pojo.entity.CycleTestItem; import org.springblade.desk.quality.pojo.entity.CycleTestStandard; import org.springblade.desk.quality.pojo.request.CycleTestItemSubmit; import org.springblade.desk.quality.pojo.vo.CycleTestItemVO; +import org.springblade.desk.quality.util.IdUtil; import org.springblade.desk.quality.wrapper.CycleTestItemWrapper; import org.springblade.resource.feign.IAttachClient; import org.springblade.resource.pojo.entity.Attach; @@ -144,11 +145,13 @@ public class CycleTestItemService2 { CycleTestStandard standard = standardService.getById(vo.getCycleTestStandardId()); if (standard != null) { vo.setCycleTestStandardName(standard.getName()); - Attach attach = attachClient.detailById(standard.getStandardAttachId()).getData(); - if (attach != null) { - vo.setStandardAttachId(attach.getId()); - vo.setLink(attach.getLink()); - vo.setOriginalName(attach.getOriginalName()); + if (IdUtil.isValid(standard.getStandardAttachId())) { + Attach attach = attachClient.detailById(standard.getStandardAttachId()).getData(); + if (attach != null) { + vo.setStandardAttachId(attach.getId()); + vo.setLink(attach.getLink()); + vo.setOriginalName(attach.getOriginalName()); + } } } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestStandardService2.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestStandardService2.java index 3ef7217..1eeb7f1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestStandardService2.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestStandardService2.java @@ -10,6 +10,7 @@ import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.quality.mapper.CycleTestStandardMapper; import org.springblade.desk.quality.pojo.entity.CycleTestStandard; import org.springblade.desk.quality.pojo.vo.CycleTestStandardVO; +import org.springblade.desk.quality.util.IdUtil; import org.springblade.resource.feign.IAttachClient; import org.springblade.resource.pojo.entity.Attach; import org.springframework.stereotype.Service; @@ -61,10 +62,12 @@ public class CycleTestStandardService2 { } public void setVOValue(CycleTestStandardVO vo) { - Attach attach = attachClient.detailById(vo.getStandardAttachId()).getData(); - if (attach != null) { - vo.setOriginalName(attach.getOriginalName()); - vo.setLink(attach.getLink()); + if(IdUtil.isValid(vo.getStandardAttachId())) { + Attach attach = attachClient.detailById(vo.getStandardAttachId()).getData(); + if (attach != null) { + vo.setOriginalName(attach.getOriginalName()); + vo.setLink(attach.getLink()); + } } } }