From 8cd2ca58aaaba9f54acae8969a0b5db6210a0a2c Mon Sep 17 00:00:00 2001 From: wangqian <1406304305@qq.com> Date: Mon, 22 Dec 2025 14:48:50 +0800 Subject: [PATCH] 工单管理修改 --- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java index 1587814..443046a 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java @@ -32,13 +32,15 @@ public interface MainInfoConvert { MainInfoRespVO mainInfoVo = BeanUtils.toBean(mainInfoDO, MainInfoRespVO.class); if (attachmentMap != null && !attachmentMap.isEmpty()) { AttachmentDO attachmentDO = attachmentMap.get(mainInfoDO.getOrderNo()); - String fileNamesStr = attachmentDO.getFileNames(); - List fileNameList = fileNamesStr == null - ? List.of() - : Arrays.stream(fileNamesStr.split(",")) - .filter(fileName -> fileName != null && !fileName.trim().isEmpty()) // 过滤空字符串和空白 - .collect(Collectors.toList()); - mainInfoVo.setFileNames(fileNameList); + if (attachmentDO != null) { + String fileNamesStr = attachmentDO.getFileNames(); + List fileNameList = fileNamesStr == null + ? List.of() + : Arrays.stream(fileNamesStr.split(",")) + .filter(fileName -> fileName != null && !fileName.trim().isEmpty()) // 过滤空字符串和空白 + .collect(Collectors.toList()); + mainInfoVo.setFileNames(fileNameList); + } } return mainInfoVo; }); @@ -50,13 +52,15 @@ public interface MainInfoConvert { if (mainInfoDO != null) { if (attachmentMap != null && !attachmentMap.isEmpty()) { AttachmentDO attachmentDO = attachmentMap.get(mainInfoDO.getOrderNo()); - String fileNamesStr = attachmentDO.getFileNames(); - List fileNameList = fileNamesStr == null - ? List.of() - : Arrays.stream(fileNamesStr.split(",")) - .filter(fileName -> fileName != null && !fileName.trim().isEmpty()) // 过滤空字符串和空白 - .collect(Collectors.toList()); - mainInfoVo.setFileNames(fileNameList); + if (attachmentDO != null) { + String fileNamesStr = attachmentDO.getFileNames(); + List fileNameList = fileNamesStr == null + ? List.of() + : Arrays.stream(fileNamesStr.split(",")) + .filter(fileName -> fileName != null && !fileName.trim().isEmpty()) // 过滤空字符串和空白 + .collect(Collectors.toList()); + mainInfoVo.setFileNames(fileNameList); + } } mainInfoVo.setCompanyName(deptName); if (mainInfoVo.getCoHandlers() != null && !mainInfoVo.getCoHandlers().isEmpty()) { -- libgit2 0.21.4