From b51c9e7baed10418c4ed27206e38c51067bec1d9 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 25 Nov 2022 13:32:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-client-yushan | 2 +- epdc-cloud-commons-yushan | 2 +- .../epdc/modules/issue/service/impl/IssueServiceImpl.java | 4 ++++ epdc-cloud-parent-yushan | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 310ff06..f44c880 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 310ff06907d82bb878eda31bf6054542adc8cb5a +Subproject commit f44c8804c072a0eaecd2186f371bc2a43d83f3b4 diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index 128c6a4..14ba011 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit 128c6a4bfb8087999b492a6febfdde984623fe3a +Subproject commit 14ba01162799b397ec4cae757f29790fc88df9cb diff --git a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index 0586971..e6204fe 100644 --- a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.issue.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; @@ -457,6 +458,9 @@ public class IssueServiceImpl extends BaseServiceImpl imp } else { list = SecurityUser.getUser().getDeptIdList(); } + if (CollectionUtils.isEmpty(list)) { + return new Result().ok(null); + } IssueStateStatisticsResultDTO issueDto = baseDao.selectCountOfIssueState(list); IssueStateStatisticsResultDTO eventDto = epdcEventsService.selectCountOfEventState(list); issueDto.setPendingResponseNum(eventDto.getPendingResponseNum()); diff --git a/epdc-cloud-parent-yushan b/epdc-cloud-parent-yushan index 6c53fd9..7d5b870 160000 --- a/epdc-cloud-parent-yushan +++ b/epdc-cloud-parent-yushan @@ -1 +1 @@ -Subproject commit 6c53fd985cbaae46046a44a2d84f1eb9bff86a9d +Subproject commit 7d5b8709e3fa8224b3463e120f7b79af1feea28c