diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ResiEventReportOrgDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ResiEventReportOrgDTO.java
new file mode 100644
index 0000000000..2576c3df7e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ResiEventReportOrgDTO.java
@@ -0,0 +1,112 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dataaggre.dto.govproject;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 事件相关组织表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-08-03
+ */
+@Data
+public class ResiEventReportOrgDTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 事件id
+     */
+	private String resiEventId;
+
+    /**
+     * 报给？：
+网格：grid；
+社区：community；
+乡（镇、街道）级:street；
+区县级: district；
+市级: city；
+省级:province。
+     */
+	private String orgType;
+
+    /**
+     * 报给的组织或者网格id
+     */
+	private String orgId;
+
+    /**
+     * org_id的上级组织id，org_id是跟组织，此列为0
+     */
+	private String orgPid;
+
+    /**
+     * org_id的所有上级组织id，org_id是跟组织，此列为0
+     */
+	private String orgPids;
+
+    /**
+     * 含义：已读read，未读：un_read；组织下的工作人员从待处理=>处理中，点击查看详情前更新为已读；
+     */
+	private String orgRead;
+
+    /**
+     * (1)含义：1:展示红点；0：不展示；(2)注意：发布事件插入数据时为1，(3)何时更新？：人大代表回复or报事人回复or工作人员回复、立项、办结更新为1；
+     */
+	private Boolean redDot;
+
+	/**
+	 * 删除标识:0.未删除 1.已删除
+	 */
+	private String delFlag;
+
+	/**
+	 * 乐观锁
+	 */
+	private Integer revision;
+
+	/**
+	 * 创建人
+	 */
+	private String createdBy;
+
+	/**
+	 * 创建时间
+	 */
+	private Date createdTime;
+
+	/**
+	 * 更新人
+	 */
+	private String updatedBy;
+
+	/**
+	 * 更新时间
+	 */
+	private Date updatedTime;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java
index 0d5b2f2707..5386febe19 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/CategoryProjectResultDTO.java
@@ -32,12 +32,14 @@ public class CategoryProjectResultDTO implements Serializable {
         private List<String> categoryCodes = new ArrayList<>();
         //一级分类名称集合
         private List<String> categoryNames = new ArrayList<>();
-        //来源：议题issue  项目立项:agency 事件:resi_event【控制电机查看时里边三个按钮的显示】
+        //网格Id
+        private String gridId;
+        //来源：议题issue  项目立项:agency 事件:resi_event【控制点击查看时里边三个按钮的显示】
         private String origin;
-        //网格Id[上报给组织的事件、直接立项的项目此值为空]
-        private String gridId = "";
-        //网格名[上报给组织的事件、直接立项的项目此值为空]
-        private String gridName = "";
+        //来源Id
+        private String originId;
+        //所属组织名[来源楼院小组的项目所属组织显示来源的网格名，直接立项的显示立项的组织名，来源事件的显示上报给的网格或组织名]
+        private String orgName = "";
         //状态:待处理 pending，已结案closed
         private String status;
         //标题
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java
index 422aa74f4c..523386aacb 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java
@@ -102,9 +102,9 @@ public class GovProjectController {
 	 * @author sun
 	 */
 	@PostMapping("categoryprojectlist")
-	public Result<CategoryProjectResultDTO> categoryProjectList(@LoginUser TokenDto tokenDto, @RequestBody CategoryProjectFormDTO formDTO) {
+	public Result<CategoryProjectResultDTO> categoryProjectList(@RequestBody CategoryProjectFormDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO, CategoryProjectFormDTO.Category.class);
-        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
 		return new Result<CategoryProjectResultDTO>().ok(govProjectService.categoryProjectList(formDTO));
 	}
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
index ee44c3cee8..ecc9333edd 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
@@ -22,6 +22,7 @@ import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO;
 import com.epmet.dataaggre.dto.govproject.ProjectDTO;
 import com.epmet.dataaggre.dto.govproject.ProjectRelatedPersonnelDTO;
 import com.epmet.dataaggre.dto.govproject.ResiEventDTO;
+import com.epmet.dataaggre.dto.govproject.ResiEventReportOrgDTO;
 import com.epmet.dataaggre.dto.govproject.form.AllProjectFormDTO;
 import com.epmet.dataaggre.dto.govproject.form.CategoryProjectFormDTO;
 import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO;
@@ -115,4 +116,9 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
                                                           @Param("userIds") List<String> userIds,
                                                           @Param("origin") String origin);
 
+    /**
+     * @Description 事件项目上报组织信息
+     * @author sun
+     */
+    List<ResiEventReportOrgDTO> getEventOrgList(@Param("eventIds") List<String> eventIds);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
index fb91510b88..77adb4e22a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
@@ -6,7 +6,10 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
@@ -22,6 +25,7 @@ import com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO;
 import com.epmet.dataaggre.dto.govproject.ProjectDTO;
 import com.epmet.dataaggre.dto.govproject.ProjectRelatedPersonnelDTO;
 import com.epmet.dataaggre.dto.govproject.ResiEventDTO;
+import com.epmet.dataaggre.dto.govproject.ResiEventReportOrgDTO;
 import com.epmet.dataaggre.dto.govproject.form.*;
 import com.epmet.dataaggre.dto.govproject.result.*;
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
@@ -46,6 +50,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -383,23 +388,66 @@ public class GovProjectServiceImpl implements GovProjectService {
 		List<String> projectIds = result.getList().stream().map(CategoryProjectResultDTO.Project::getProjectId).collect(Collectors.toList());
 		List<CategoryProjectResultDTO.Project> list = projectDao.getCategoryList(projectIds);
 
-		//4.查询网格信息【楼院小组类项目、上报事件且上报给网格的项目才存在网格Id】
-		List<String> gridIds = result.getList().stream().map(CategoryProjectResultDTO.Project::getGridId).collect(Collectors.toList());
-		gridIds = gridIds.stream().distinct().collect(Collectors.toList());
-		List<GridsInfoListResultDTO> gridList = govOrgService.gridListByIds(gridIds);
+		//4.查询来源事件的项目上报的组织信息
+		List<String> eventIds = result.getList().stream().filter(re -> "resi_event".equals(re.getOrigin())).map(m -> m.getOriginId()).collect(Collectors.toList());
+		List<ResiEventReportOrgDTO> eventOrgList = projectDao.getEventOrgList(eventIds);
+		Map<String, ResiEventReportOrgDTO> eventMap = eventOrgList.stream().collect(Collectors.toMap(ResiEventReportOrgDTO::getResiEventId, Function.identity()));
 
 		//5.查询来源议题、事件的项目居民端创建人userId
 		List<ResiEventDTO> eventUser = projectDao.getEventList(projectIds);
 		List<ProjectRelatedPersonnelDTO> topicUser = projectDao.getTopicUser(projectIds);
 
 		//5.封装数据
+		//组织或网格id->组织或网格名称
+		Map<String, String> map = new HashMap<>();
 		result.getList().forEach(re -> {
-			//项目涉及网格信息
-			gridList.forEach(g -> {
-				if (StringUtils.isNotBlank(re.getGridId()) && re.getGridId().equals(g.getGridId())) {
-					re.setGridName(g.getName());
+			//所属组织
+			if ("issue".equals(re.getOrigin())) {
+				if (map.containsKey(re.getGridId())) {
+					re.setOrgName(map.get(re.getGridId()));
+				} else {
+					GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(re.getGridId());
+					if (gridInfo != null) {
+						re.setOrgName(gridInfo.getGridName());
+						map.put(re.getGridId(), gridInfo.getGridName());
+					}
 				}
-			});
+			} else if ("agency".equals(re.getOrigin())) {
+				if (map.containsKey(re.getAgencyId())) {
+					re.setOrgName(map.get(re.getAgencyId()));
+				} else {
+					AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(re.getAgencyId());
+					if (agencyInfo != null) {
+						re.setOrgName(agencyInfo.getOrganizationName());
+						map.put(re.getAgencyId(), agencyInfo.getOrganizationName());
+					}
+
+				}
+			} else if ("resi_event".equals(re.getOrigin())) {
+				if (eventMap.containsKey(re.getOriginId())) {
+					if ("grid".equals(eventMap.get(re.getOriginId()).getOrgType())) {
+						if (map.containsKey(re.getGridId())) {
+							re.setOrgName(map.get(re.getGridId()));
+						} else {
+							GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(re.getGridId());
+							if (gridInfo != null) {
+								re.setOrgName(gridInfo.getGridName());
+								map.put(re.getGridId(), gridInfo.getGridName());
+							}
+						}
+					} else {
+						if (map.containsKey(re.getAgencyId())) {
+							re.setOrgName(map.get(re.getAgencyId()));
+						} else {
+							AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(re.getAgencyId());
+							if (agencyInfo != null) {
+								re.setOrgName(agencyInfo.getOrganizationName());
+								map.put(re.getAgencyId(), agencyInfo.getOrganizationName());
+							}
+						}
+					}
+				}
+			}
 			//项目涉及分类信息【一个项目涉及多个一级分类】
 			//一级分类Id
 			List<String> caId = new ArrayList<>();
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
index f7b74ccdb9..c8682a66dc 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
@@ -267,6 +267,7 @@
             p.agency_id agencyId,
             p.id projectId,
             p.origin origin,
+            p.origin_id originId,
             IFNULL(pc.grid_id, '') gridId,
             p.`status` status,
             p.title title,
@@ -380,4 +381,19 @@
         ORDER BY p.created_time DESC
     </select>
 
+    <select id="getEventOrgList" resultType="com.epmet.dataaggre.dto.govproject.ResiEventReportOrgDTO">
+        SELECT
+            customer_id,
+            resi_event_id,
+            org_type,
+            org_id
+        FROM
+            resi_event_report_org
+        WHERE
+            del_flag = '0'
+        <foreach collection="eventIds" item="eventId" open="AND resi_event_id IN (" separator="," close=")">
+            #{eventId}
+        </foreach>
+    </select>
+
 </mapper>
\ No newline at end of file