From 409fef4c55ac848c85d886a4b2f28099da47aa73 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Tue, 29 Aug 2023 15:19:52 +0800 Subject: [PATCH] =?UTF-8?q?#=E5=B7=A5=E4=BD=9C=E5=8F=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operational/main/service/impl/MainWorkBenchServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java index 3ff6723..500ecd8 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java @@ -230,10 +230,13 @@ public class MainWorkBenchServiceImpl extends BaseServiceImplStringUtils.isNotEmpty(o.getRefDept())).collect(Collectors.toList()))){ // 设置结果集 - workBench.setMainWorkBenchEntityList(routes.stream().filter(o->o.getAscriptionUser().contains(user)).collect(Collectors.toList())); + workBench.setMainWorkBenchEntityList(routes.stream().filter(o->StringUtils.isNotEmpty(o.getAscriptionUser()) && o.getAscriptionUser().contains(user)).collect(Collectors.toList())); }else{ // 设置结果集 workBench.setMainWorkBenchEntityList(routes.stream().filter(o->{ + if(StringUtils.isEmpty(o.getRefDept())){ + return false; + } for(String deptId: depts) { if (o.getRefDept().contains(deptId)) { return true;