Browse Source

判空

master
zhangyuan 3 years ago
parent
commit
b51c9e7bae
  1. 2
      epdc-cloud-client-yushan
  2. 2
      epdc-cloud-commons-yushan
  3. 4
      epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
  4. 2
      epdc-cloud-parent-yushan

2
epdc-cloud-client-yushan

@ -1 +1 @@
Subproject commit 310ff06907d82bb878eda31bf6054542adc8cb5a Subproject commit f44c8804c072a0eaecd2186f371bc2a43d83f3b4

2
epdc-cloud-commons-yushan

@ -1 +1 @@
Subproject commit 128c6a4bfb8087999b492a6febfdde984623fe3a Subproject commit 14ba01162799b397ec4cae757f29790fc88df9cb

4
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.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; 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.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant;
@ -457,6 +458,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
} else { } else {
list = SecurityUser.getUser().getDeptIdList(); list = SecurityUser.getUser().getDeptIdList();
} }
if (CollectionUtils.isEmpty(list)) {
return new Result<IssueStateStatisticsResultDTO>().ok(null);
}
IssueStateStatisticsResultDTO issueDto = baseDao.selectCountOfIssueState(list); IssueStateStatisticsResultDTO issueDto = baseDao.selectCountOfIssueState(list);
IssueStateStatisticsResultDTO eventDto = epdcEventsService.selectCountOfEventState(list); IssueStateStatisticsResultDTO eventDto = epdcEventsService.selectCountOfEventState(list);
issueDto.setPendingResponseNum(eventDto.getPendingResponseNum()); issueDto.setPendingResponseNum(eventDto.getPendingResponseNum());

2
epdc-cloud-parent-yushan

@ -1 +1 @@
Subproject commit 6c53fd985cbaae46046a44a2d84f1eb9bff86a9d Subproject commit 7d5b8709e3fa8224b3463e120f7b79af1feea28c
Loading…
Cancel
Save