From 7f1c4dd8c41b38ce35fec9c5fd2adf3a7ba8cd81 Mon Sep 17 00:00:00 2001 From: FCL Date: Fri, 28 Nov 2025 09:04:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:Dict=E6=B3=A8=E8=A7=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/controller/vo/ConfigWarehouseLocationRespVO.java | 2 ++ .../java/com/zt/plat/module/qms/core/aspect/DictAspect.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigWarehouseLocationRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigWarehouseLocationRespVO.java index 5c70c43..85da06a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigWarehouseLocationRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigWarehouseLocationRespVO.java @@ -1,5 +1,6 @@ package com.zt.plat.module.qms.business.config.controller.vo; +import com.zt.plat.module.qms.core.aspect.annotation.Dict; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -17,6 +18,7 @@ public class ConfigWarehouseLocationRespVO { @ExcelProperty("ID") private Long id; +// @Dict(dictTable="t_cfg_wrh_loc",dicCode="id",dicText="name") @Schema(description = "父ID", example = "31498") @ExcelProperty("父ID") private Long parentId; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/aspect/DictAspect.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/aspect/DictAspect.java index c74d0af..316775f 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/aspect/DictAspect.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/aspect/DictAspect.java @@ -137,7 +137,7 @@ public class DictAspect { String dictCode = code; if (!StringUtils.isEmpty(table)) { //指定table - dictCode = String.format("%s,%s,%s,%s", table, text, code, keyOrId); + dictCode = String.format("%s,%s,%s", table, text, code); }else{ dictCode = String.format("%s"+DICT_ANNOTATION_SPLIT+"%s", code, keyOrId); }