废弃网格，前置判断项目

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<CustomerGridDao, Cu
     @Override
     public void abandonGrid(AbandonGridFormDTO formDTO) {
         //未处理的事件
-        Result<Boolean> eventRes = govProjectOpenFeignClient.eventAuditReset(formDTO.getGridId());
+        Result<ProjectAuditResetResultDTO> projectDb = govProjectOpenFeignClient.eventAuditReset(formDTO.getGridId());
         //表决中的议题
         Result<Boolean> 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(), "存在未关闭的议题", "该网格存在未关闭的议题，请先将议题关闭后再操作");
         }