From c22edf30a10f412e61f7dc516d31432b43b862ad Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 21 Mar 2022 16:32:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=9F=E5=BC=83=E7=BD=91=E6=A0=BC=EF=BC=8C?= =?UTF-8?q?=E5=89=8D=E7=BD=AE=E5=88=A4=E6=96=AD=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/CustomerGridServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index e4fa3887ca..5e7aa468ff 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -970,15 +970,18 @@ public class CustomerGridServiceImpl extends BaseServiceImpl eventRes = govProjectOpenFeignClient.eventAuditReset(formDTO.getGridId()); + Result projectDb = govProjectOpenFeignClient.eventAuditReset(formDTO.getGridId()); //表决中的议题 Result issueAuditReset = govIssueOpenFeignClient.issueAuditReset(formDTO.getGridId()); - if (!eventRes.success() || !issueAuditReset.success()) { + if (!projectDb.success() || !issueAuditReset.success()) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "校验数据异常", "服务器开小差了..."); } - if (eventRes.getData()) { + if (projectDb.getData().getResiEventStatus()) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未处理的事件", "该网格存在未办结的群众直报事件，请先将事件办结后再操作"); } + if (projectDb.getData().getProjectStatus()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未办结的项目", "该网格工作人员名下存在未结案的项目，请先将项目结案或转其它科室部门后再操作"); + } if (issueAuditReset.getData()) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未关闭的议题", "该网格存在未关闭的议题，请先将议题关闭后再操作"); }