From b0c2f6ab6d5b7df69bea90f23c637c9be7121c90 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 23 May 2022 11:42:20 +0800
Subject: [PATCH] bugfix

---
 .../com/epmet/service/impl/IcEventServiceImpl.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
index faf39035ee..3e07d15b32 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
@@ -1017,11 +1017,15 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         }
         for (SubOrgResDTO org : subOrgListRes.getData()) {
             IcEventAnalysisOrgResDTO resultDto = ConvertUtils.sourceToTarget(org, IcEventAnalysisOrgResDTO.class);
-            String purePids = org.getPids();
-            if ("0".equals(purePids) || StringUtils.isBlank(purePids)) {
-                formDTO.setGridPids(org.getOrgId());
-            } else {
-                formDTO.setGridPids(purePids.concat(":").concat(org.getOrgId()));
+            formDTO.setOrgId(org.getOrgId());
+            formDTO.setOrgType(org.getOrgType());
+            if("agency".equals(org.getOrgType())){
+                String purePids = org.getPids();
+                if ("0".equals(purePids) || StringUtils.isBlank(purePids)) {
+                    formDTO.setGridPids(org.getOrgId());
+                } else {
+                    formDTO.setGridPids(purePids.concat(":").concat(org.getOrgId()));
+                }
             }
             resultDto.setTotal(baseDao.selectOrgTotal(formDTO));
             list.add(resultDto);