From f871ea9257949216eaab90fb56e7a1a11a166a8c Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 29 Jul 2024 09:40:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8B=93=E5=B1=95OA=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/qs/serve/modules/seeyon/entity/CtpAffair.java | 6 ++++++ .../tbs/service/impl/TbsCostApplyOperationServiceImpl.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffair.java b/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffair.java index febfbe9c..80282670 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffair.java +++ b/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffair.java @@ -39,10 +39,16 @@ public class CtpAffair { private String targetId; + @TableField(exist = false) private String param0; + @TableField(exist = false) private String param1; + @TableField(exist = false) private String param2; + @TableField(exist = false) private String param3; + @TableField(exist = false) private String param4; + @TableField(exist = false) private String param5; } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java index b1308af1..9c29533f 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java @@ -208,7 +208,7 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService DataAffairCommitMapper dataAffairCommitMapper = SpringUtils.getBean(DataAffairCommitMapper.class); SysAttachMapper sysAttachMapper = SpringUtils.getBean(SysAttachMapper.class); List affairCommits = dataAffairCommitMapper.selectBatchIds(ctpAffairs.stream() - .map(CtpAffair::getAffairId).collect(Collectors.toList())); + .filter(Objects::nonNull).map(CtpAffair::getAffairId).collect(Collectors.toList())); List oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList()); List userList = getSysUserService().listByOaMemberIds(oaUserIds); SysPostUserService postUserService = SpringUtils.getBean(SysPostUserService.class);