From 61ca2cc52e437078acd292be7fa72b1eac5f0a60 Mon Sep 17 00:00:00 2001 From: shusir <497819738@qq.com> Date: Thu, 26 Feb 2026 09:08:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=88=87=E9=9D=A2=E5=93=8D=E5=BA=94=E5=8D=95=E4=B8=AA=E7=A9=BA?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E6=B2=A1=E6=9C=89=E5=88=A4=E7=A9=BA=EF=BC=9B?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=AE=9E=E4=BE=8B=E5=8A=A0=E6=A3=80=E7=B4=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zt/plat/module/qms/core/aspect/DictAspect.java | 5 +++++ .../zt/plat/module/qms/core/legend/LegendConvertUtils.java | 4 ++++ .../material/controller/vo/MaterialInfomationRespVO.java | 3 +++ .../material/dal/mapper/MaterialInfomationMapper.java | 7 +++++-- 4 files changed, 17 insertions(+), 2 deletions(-) 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 3b0b0770..3bc838b5 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 @@ -407,6 +407,11 @@ public class DictAspect { */ private Boolean checkHasDict(List records){ if(LegendConvertUtils.isNotEmpty(records) && records.size()>0){ + // 添加对第一个元素的空值检查 + Object firstRecord = records.get(0); + if (firstRecord == null) { + return false; + } for (Field field : LegendConvertUtils.getAllFields(records.get(0))) { if (LegendConvertUtils.isNotEmpty(field.getAnnotation(Dict.class))) { return true; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/legend/LegendConvertUtils.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/legend/LegendConvertUtils.java index c7999d46..c740dd3e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/legend/LegendConvertUtils.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/legend/LegendConvertUtils.java @@ -604,6 +604,10 @@ public class LegendConvertUtils { * @return */ public static Field[] getAllFields(Object object) { + // 添加空值检查 + if (object == null) { + return new Field[0]; + } Class clazz = object.getClass(); List fieldList = new ArrayList<>(); while (clazz != null) { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationRespVO.java index 167e1d1f..3c078918 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationRespVO.java @@ -121,14 +121,17 @@ public class MaterialInfomationRespVO { @Schema(description = "是否危险品,1-是，0-否") @ExcelProperty("是否危险品,1-是，0-否") + @Dict(dicCode = "yes_or_no") private Integer hazardous; @Schema(description = "是否标准溶液,1-是，0-否") @ExcelProperty("是否标准溶液,1-是，0-否") + @Dict(dicCode = "yes_or_no") private Integer standardSolutionFlag; @Schema(description = "是否标准物质,1-是，0-否") @ExcelProperty("是否标准物质,1-是，0-否") + @Dict(dicCode = "yes_or_no") private Integer standardMaterialFlag; @Schema(description = "配置人") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInfomationMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInfomationMapper.java index 30aa90eb..c5cdb6a8 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInfomationMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInfomationMapper.java @@ -106,7 +106,10 @@ public interface MaterialInfomationMapper extends BaseMapperX wrapper = getInfomationDOMPJLambdaWrapper(); wrapper.eqIfExists(MaterialInfomationDO::getCode, queryVO.getCode()) .eqIfExists(MaterialInfomationDO::getUsageStatus, queryVO.getUsageStatus()) - .eqIfExists(MaterialInfomationDO::getUseEndFlag, queryVO.getUseEndFlag()); + .eqIfExists(MaterialInfomationDO::getUseEndFlag, queryVO.getUseEndFlag()) + .eqIfExists(MaterialProductDO::getHazardous, queryVO.getHazardous()) + .eqIfExists(MaterialProductDO::getStandardMaterialFlag, queryVO.getStandardMaterialFlag()) + .eqIfExists(MaterialProductDO::getStandardSolutionFlag, queryVO.getStandardSolutionFlag()); return selectJoinOne(MaterialInfomationRespVO.class, wrapper); } @@ -132,7 +135,7 @@ public interface MaterialInfomationMapper extends BaseMapperX