From b192552cd36bf05adb7700accfb7865e34b6ae50 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 18 May 2020 11:48:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=8E=8B=E6=9C=9D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=9A=84bug=E5=8F=91=E5=B8=83=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- .../resi-hall/resi-hall-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-hall/resi-hall-server/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml index 4e2018ac56..3021da0d0e 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.5 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.6 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 87bfe7d613..f7df052ed4 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.5 + 0.3.6 gov-issue com.epmet diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index f7d739347d..42084082bf 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.21 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.22 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index f8a09330d6..c141ba8898 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.21 + 0.3.22 com.epmet resi-group diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml index 14e72cddcf..f1a133ab3c 100644 --- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-hall-server: container_name: resi-hall-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.5 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.6 ports: - "8100:8100" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index dc4d10adcf..4f96a103d9 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.5 + 0.3.6 resi-hall com.epmet From ee59b780b1225b7d7fdd5ec1958c7d374ccb524a Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Mon, 18 May 2020 12:03:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=A1=A5=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/IssueProcessDao.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java index d48ecb94cb..c236ee2712 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java @@ -19,11 +19,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.IssueIdFormDTO; -import com.epmet.dto.result.IssueProcessResultDTO; import com.epmet.dto.IssueProcessDTO; +import com.epmet.dto.result.ProcessListResultDTO; import com.epmet.entity.IssueProcessEntity; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -50,8 +49,13 @@ public interface IssueProcessDao extends BaseDao { * @param issueId * @author zxc */ - List issueProcess(IssueIdFormDTO issueId); + List issueProcess(IssueIdFormDTO issueId); - IssueProcessResultDTO issueBeginInfo(IssueIdFormDTO formDTO); + /** + * @Description 查询转议题信息 + * @param formDTO + * @author zxc + */ + ProcessListResultDTO issueBeginInfo(IssueIdFormDTO formDTO); } \ No newline at end of file From 5711e4fc811ff0657868095fe55af84362947286 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 18 May 2020 12:49:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=AF=A6=E6=83=85bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml index 3021da0d0e..fd00916118 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.6 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.7 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index f7df052ed4..6e8fed3389 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.6 + 0.3.7 gov-issue com.epmet From 3147b83adcc05d8f9157ec897fc2881212a7071d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 18 May 2020 14:24:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E8=B7=9F=E8=B8=AA-=E8=87=AA?= =?UTF-8?q?=E6=B5=8B=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/constant/IssueConstant.java | 3 +++ .../java/com/epmet/feign/GovOrgFeignClient.java | 2 +- .../fallback/GovOrgFeignClientFallBack.java | 2 +- .../com/epmet/service/impl/IssueServiceImpl.java | 16 +++++++++++++--- .../epmet/constant/CustomerAgencyConstant.java | 4 ++++ .../controller/CustomerAgencyController.java | 4 ++-- .../service/impl/CustomerAgencyServiceImpl.java | 5 ++++- .../service/impl/ProjectProcessServiceImpl.java | 3 +++ .../ProjectSatisfactionDetailServiceImpl.java | 12 ++++++------ .../service/impl/ProjectStaffServiceImpl.java | 3 +++ 10 files changed, 40 insertions(+), 14 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java index cf436dfdbb..d2f4938490 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java @@ -54,4 +54,7 @@ public interface IssueConstant { String ISSUE_GRID = "grid"; String SELECT_USERINFO_EXCEPTION = "获取用户昵称、头像失败"; + String SELECT_GOV_ORG_EXCEPTION = "获取议题所属组织、网格信息失败"; + String OPERATION_EXCEPTION = "议题已关闭，不能再次关闭"; + String GOV_PRJECT_EXCEPTION = "议题转项目，获取项目数据失败"; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java index f521975727..0807db399e 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -27,7 +27,7 @@ public interface GovOrgFeignClient { * @Author sun * @Description 根据组织Id、网格Id查询组织、网格名称 **/ - @PostMapping("/gov/org/customergrid/getcustomergridbygridid") + @PostMapping("/gov/org/customeragency/getagencyandgrid") Result getAgencyAndGrid(AgencyGridResultDTO agencyGridResultDTO); /** diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java index a659baa435..014a6632cb 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java @@ -21,7 +21,7 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient { @Override public Result getAgencyAndGrid(AgencyGridResultDTO agencyGridResultDTO) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getagencyandgrid", agencyGridResultDTO); + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyAndGrid", agencyGridResultDTO); } @Override diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index d183de75ac..066333305c 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -346,6 +346,9 @@ public class IssueServiceImpl extends BaseServiceImpl imp if (null == entity) { throw new RenException(IssueConstant.SELECT_EXCEPTION); } + if (IssueConstant.ISSUE_CLOSED.equals(entity.getIssueStatus())) { + throw new RenException(IssueConstant.OPERATION_EXCEPTION); + } entity.setIssueStatus(IssueConstant.ISSUE_CLOSED); entity.setCloseReason(formDTO.getCloseReason()); entity.setResolveType(formDTO.getResolveType()); @@ -360,6 +363,9 @@ public class IssueServiceImpl extends BaseServiceImpl imp agencyGridResultDTO.setAgencyId(entity.getOrgId()); agencyGridResultDTO.setGridId(entity.getGridId()); Result resultDTO = govOrgFeignClient.getAgencyAndGrid(agencyGridResultDTO); + if (!resultDTO.success() || null == resultDTO.getData()) { + throw new RenException(IssueConstant.SELECT_GOV_ORG_EXCEPTION); + } agencyGridResultDTO = resultDTO.getData(); //3:议题进展记录表新增数据 @@ -367,7 +373,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp processEntity.setIssueId(formDTO.getIssueId()); processEntity.setIssueStatus(IssueConstant.ISSUE_CLOSED); processEntity.setOrgType(IssueConstant.ISSUE_GRID); - processEntity.setOrgId(entity.getOrgId()); + processEntity.setOrgId(entity.getGridId()); processEntity.setOperationExplain(formDTO.getCloseReason()); processEntity.setOrgName(agencyGridResultDTO.getAgencyName() + "-" + agencyGridResultDTO.getGridName()); issueProcessDao.insert(processEntity); @@ -409,10 +415,11 @@ public class IssueServiceImpl extends BaseServiceImpl imp msgDTO.setTitle(UserMessageConstant.ISSUE_TITLE); msgDTO.setMessageContent(messageContent); msgDTO.setReadFlag(ReadFlagConstant.UN_READ); + UserMessageFormDTO msgIssue = ConvertUtils.sourceToTarget(msgDTO,UserMessageFormDTO.class); msgDTO.setUserId(topicDTO.getCreatedBy()); msgList.add(msgDTO); - msgDTO.setUserId(entity.getCreatedBy()); - msgList.add(msgDTO); + msgIssue.setUserId(entity.getCreatedBy()); + msgList.add(msgIssue); return messageFeignClient.saveUserMessageList(msgList); } @@ -466,6 +473,9 @@ public class IssueServiceImpl extends BaseServiceImpl imp //2:调用gov-project服务，新增项目各业务表初始数据 Result resultDTO = govProjectFeignClient.issueShiftProject(formDTO); + if (!resultDTO.success() || null == resultDTO.getData()) { + throw new RenException(IssueConstant.GOV_PRJECT_EXCEPTION); + } IssueProjectResultDTO issueProjectResultDTO = resultDTO.getData(); //3:更新议题相关业务表数据 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java index f30c8c65ce..c4d48ee458 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java @@ -51,4 +51,8 @@ public interface CustomerAgencyConstant { * 工作人员角色-网格长 */ String GRID_MANAGER = "grid_manager"; + /** + * 调用epmet-user服务查询用户基础信息失败 + */ + String SELECT_USER_EXCEPTION = "获取用户基本信息失败"; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index 8ddc017fa2..1ccdc9738b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -125,7 +125,7 @@ public class CustomerAgencyController { * @Description 查询组织下人员,组织下部门人员,组织下网格人员列表信息 **/ @PostMapping("departmentstafflist") - public Result departmentStaffList(CanTickStaffListFormDTO canTick) { + public Result departmentStaffList(@RequestBody CanTickStaffListFormDTO canTick) { return new Result().ok(customerAgencyService.departmentStaffList(canTick)); } @@ -136,7 +136,7 @@ public class CustomerAgencyController { * @Description 根据组织Id集合、部门Id集合、网格Id集合查询各自对应详细信息 **/ @PostMapping("getagencydeptgridlist") - public Result getAgencyDeptGridList(AgencyDeptGridFormDTO formDTO) { + public Result getAgencyDeptGridList(@RequestBody AgencyDeptGridFormDTO formDTO) { return new Result().ok(customerAgencyService.getAgencyDeptGridList(formDTO)); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 5be49bf353..f93114f028 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -190,7 +190,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl agencyStaffList = customerStaffAgencyDao.selectAgencyStaffList(canTick.getAgencyId(),staffId); @@ -241,6 +241,9 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl(new LinkedHashSet<>(staffIdList)); Result userList = epmetUserFeignClient.getCustomerStaffList(staffIdList); + if(!userList.success()||null==userList.getData()){ + throw new RenException(CustomerAgencyConstant.SELECT_USER_EXCEPTION); + } //5:循环数据，将人员数据放到对应数据结构下 CustomerStaffListResultDTO dto = userList.getData(); List staffList = dto.getStaffList(); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java index 608f78f468..b7ab25727b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java @@ -206,6 +206,9 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl resultDTO = govOrgFeignClient.getAgencyDeptGridList(agencyDeptGridFormDTO); + if (!resultDTO.success() || null == resultDTO.getData()) { + throw new RenException(ProjectConstant.SELECT_GOV_ORG_EXCEPTION); + } AgencyDeptGridResultDTO agencyDeptGrid = resultDTO.getData(); //3.2:批量新增项目人员关联表数据 List entityList = new ArrayList<>(); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java index 310d1f6bc0..e831d30530 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java @@ -27,6 +27,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; import com.epmet.constant.ProjectConstant; import com.epmet.dao.ProjectSatisfactionDetailDao; import com.epmet.dto.ProjectSatisfactionDetailDTO; @@ -42,10 +43,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -130,13 +128,15 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl userIds = evaluationList.stream().map(EvaluationListResultDTO::getUserId).collect(Collectors.toList()); + userIds = new ArrayList(new LinkedHashSet<>(userIds)); //2.2:获取所有用户的头像 昵称 UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO(); userResiInfoListFormDTO.setUserIdList(userIds); - List userResiInfoList = epmetUserFeignClient.getUserResiInfoList(userResiInfoListFormDTO).getData(); - if (null == userResiInfoList || userResiInfoList.size() < NumConstant.ONE) { + Result> listResult = epmetUserFeignClient.getUserResiInfoList(userResiInfoListFormDTO); + if (null == listResult.getData()) { throw new RenException(ProjectConstant.SELECT_USERINFO_EXCEPTION); } + List userResiInfoList = listResult.getData(); //3:将每个用户的头像 昵称放到对应实体中返回给前台 List resultList = evaluationList.stream().flatMap(evaluation -> userResiInfoList.stream().filter(user -> evaluation.getUserId().equals(user.getUserId())).map(userInfo -> { diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java index 19d65197a7..340fe15393 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java @@ -140,6 +140,9 @@ public class ProjectStaffServiceImpl extends BaseServiceImpl resultDTOResult = govOrgFeignClient.departmentStaffList(canTick); + if(null==resultDTOResult.getData()){ + throw new RenException(ProjectConstant.SELECT_GOV_ORG_EXCEPTION); + } return resultDTOResult.getData(); }