diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.9__add_data_type.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.9__add_data_type.sql
new file mode 100644
index 0000000000..d4aebf1828
--- /dev/null
+++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.9__add_data_type.sql
@@ -0,0 +1,10 @@
+INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000012', 'grid_type', '网格类型', '', 12, 0, 0, '', '2021-12-23 18:23:27', '', '2021-12-23 18:23:27');
+
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000300', 1000000000000000012, '党政机关', '0', '0', '', 0, 0, 0, '', '2021-12-23 18:39:18', '', '2021-12-23 18:39:18');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000301', 1000000000000000012, '企业', '1', '0', '', 0, 0, 0, '', '2021-12-23 18:39:18', '', '2021-12-23 18:39:18');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000302', 1000000000000000012, '园区', '2', '0', '', 4, 0, 0, '', '2021-12-23 18:39:18', '', '2021-12-23 18:39:18');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000303', 1000000000000000012, '商圈', '3', '0', '', 4, 0, 0, '', '2021-12-23 18:39:18', '', '2021-12-23 18:39:18');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000304', 1000000000000000012, '市场', '4', '0', '', 4, 0, 0, '', '2021-12-23 18:39:18', '', '2021-12-23 18:39:18');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000305', 1000000000000000012, '景区', '5', '0', '', 4, 0, 0, '', '2021-12-23 18:39:18', '', '2021-12-23 18:39:18');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000306', 1000000000000000012, '医院', '6', '0', '', 4, 0, 0, '', '2021-12-23 18:39:18', '', '2021-12-23 18:39:18');
+INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000307', 1000000000000000012, '学校', '7', '0', '', 4, 0, 0, '', '2021-12-23 18:39:18', '', '2021-12-23 18:39:18');
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java
index 116b3c47a5..67391ef70c 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java
@@ -96,6 +96,7 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
         wrapper.between(IcPartyActivityEntity::getActivityTime, formDTO.getStartTime(), formDTO.getEndTime());
         wrapper.orderByDesc(IcPartyActivityEntity::getUpdatedTime);
         List<IcPartyActivityEntity> list = baseDao.selectList(wrapper);
+        PageInfo<IcPartyActivityEntity> pageInfo = new PageInfo<>(list);
         List<IcPartyActivityDTO> dtoList = ConvertUtils.sourceToTarget(list, IcPartyActivityDTO.class);
 
         IcPartyUnitDTO unitDTO = new IcPartyUnitDTO();
@@ -106,7 +107,7 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
                 dto.setUnitName(option.get(dto.getUnitId()));
             });
         }
-        PageInfo<IcPartyActivityDTO> pageInfo = new PageInfo<>(dtoList);
+
         return new PageData<>(dtoList, pageInfo.getTotal());
     }
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
index 2370562d4b..3850acd354 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
@@ -101,6 +101,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         wrapper.like(StringUtils.isNotBlank(formDTO.getContactMobile()), IcPartyUnitEntity::getContactMobile, formDTO.getContactMobile());
         wrapper.orderByDesc(IcPartyUnitEntity::getUpdatedTime);
         List<IcPartyUnitEntity> list = baseDao.selectList(wrapper);
+        PageInfo<IcPartyUnitEntity> pageInfo = new PageInfo<>(list);
         List<IcPartyUnitDTO> dtoList = ConvertUtils.sourceToTarget(list, IcPartyUnitDTO.class);
         Result<Map<String, String>> unitTypeMap =  epmetAdminOpenFeignClient.dictMap(DictTypeEnum.PARTY_UNIT_TYPE.getCode());
         SubCodeFormDTO codeFormDTO = new SubCodeFormDTO();
@@ -121,7 +122,6 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
                 item.setSatisfaction(new BigDecimal(item.getSatisfaction()).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
             }
         });
-        PageInfo<IcPartyUnitDTO> pageInfo = new PageInfo<>(dtoList);
         return new PageData<>(dtoList, pageInfo.getTotal());
     }
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
index ee7f66bc8a..ec787bcf1e 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
@@ -99,7 +99,6 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
 
     @Autowired
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
-
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
 
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 f95eb8343a..03bb84ba0d 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
@@ -771,6 +771,9 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         }
 
         CustomerGridDTO gridInfo = baseDao.gridAgencyByGrid(customerGridFormDTO.getGridId());
+        if (null != gridInfo) {
+            redisUtils.hMSet(redisKey, BeanUtil.beanToMap(gridInfo));
+        }
         /*CustomerGridDTO gridInfo = ConvertUtils.sourceToTarget(baseDao.selectById(customerGridFormDTO.getGridId()), CustomerGridDTO.class);
         if (null != gridInfo) {
             CustomerAgencyEntity agency = customerAgencyService.selectById(gridInfo.getPid());
@@ -779,7 +782,6 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
 
             redisUtils.hMSet(redisKey, BeanUtil.beanToMap(gridInfo));
         }*/
-        redisUtils.hMSet(redisKey, BeanUtil.beanToMap(gridInfo));
         return gridInfo;
     }
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
index 7b2779afea..23841bdabd 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
@@ -259,6 +259,6 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
 	 * @author zxc
 	 * @date 2021/12/10 10:31 上午
 	 */
-	List<ProjectDistributionAnalysisRightDTO> selectProjectCountByOrg(@Param("orgIds")List<String> orgIds,@Param("startDate")String startDate,@Param("endDate")String endDate);
+	List<ProjectDistributionAnalysisRightDTO> selectProjectCountByOrg(List<SonOrgResultDTO> orgIds,@Param("startDate")String startDate,@Param("endDate")String endDate);
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index 69d14d5723..8547a254b7 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -2918,26 +2918,31 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		ProjectDistributionAnalysisRightResultDTO result = new ProjectDistributionAnalysisRightResultDTO();
 		List<ProjectDistributionAnalysisRightDTO> orgList = new ArrayList<>();
 		Result<List<SonOrgResultDTO>> sonOrgList = govOrgOpenFeignClient.getSonAgencyId(formDTO.getOrgId(), agencyInfo.getLevel());
-		if (!sonOrgList.success() || CollectionUtils.isEmpty(sonOrgList.getData())){
-			throw new EpmetException(String.format("查询组织{%s}的下级组织失败或为空...",formDTO.getOrgId()));
+		if (!sonOrgList.success()){
+			throw new EpmetException(String.format("查询组织{%s}的下级组织失败...",formDTO.getOrgId()));
 		}
+		if (CollectionUtils.isEmpty(sonOrgList.getData())){
+			return result;
+		}
+		// 所有子级orgId，并构建全部数据
 		List<SonOrgResultDTO> orgIds = sonOrgList.getData();
+		for (SonOrgResultDTO o : orgIds) {
+			ProjectDistributionAnalysisRightDTO dto = new ProjectDistributionAnalysisRightDTO();
+			dto.setOrgId(o.getOrgId());
+			orgList.add(dto);
+		}
+		List<ProjectDistributionAnalysisRightDTO> dtos;
 		if (!agencyInfo.getLevel().equals(ProjectConstant.ORG_LEVEL_COMMUNITY)){
-			orgList = baseDao.selectProjectCountByOrg(orgIds.stream().map(m -> m.getPids()).collect(Collectors.toList()), formDTO.getStartDate(),formDTO.getEndDate());
+			dtos = baseDao.selectProjectCountByOrg(orgIds, formDTO.getStartDate(),formDTO.getEndDate());
 		}else {
-			for (SonOrgResultDTO o : orgIds) {
-				ProjectDistributionAnalysisRightDTO dto = new ProjectDistributionAnalysisRightDTO();
-				dto.setOrgId(o.getOrgId());
-				orgList.add(dto);
-			}
 			Result<List<ProjectDistributionAnalysisRightDTO>> projectCountByGrid = govIssueOpenFeignClient.getProjectCountByGrid(formDTO);
 			if (!projectCountByGrid.success()){
 				throw new EpmetException("查询网格项目数失败...");
 			}
-			if (CollectionUtils.isNotEmpty(projectCountByGrid.getData())){
-				orgList.stream().forEach(o -> projectCountByGrid.getData().stream().filter(p -> p.getOrgId().equals(o.getOrgId())).forEach(p -> o.setCount(p.getCount())));
-
-			}
+			dtos = projectCountByGrid.getData();
+		}
+		if (CollectionUtils.isNotEmpty(dtos)){
+			orgList.stream().forEach(o -> dtos.stream().filter(p -> p.getOrgId().equals(o.getOrgId())).forEach(p -> o.setCount(p.getCount())));
 		}
 		if (CollectionUtils.isEmpty(orgList)){
 			return result;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
index 30fd6d415c..c21670f5a5 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml
@@ -470,13 +470,13 @@
 
     <!-- 查询组织下的项目数 -->
     <select id="selectProjectCountByOrg" resultType="com.epmet.dto.result.ProjectDistributionAnalysisRightDTO">
-        <foreach collection="orgIds" item="orgId" separator=" UNION ALL ">
+        <foreach collection="orgIds" item="o" separator=" UNION ALL ">
             SELECT
-                #{orgId} AS orgId,
+                #{o.orgId} AS orgId,
                 COUNT(ID) AS count
             FROM project
             WHERE DEL_FLAG = '0'
-                AND ORG_ID_PATH LIKE CONCAT(#{orgId},'%')
+                AND ORG_ID_PATH LIKE CONCAT(#{o.pids},':',#{o.orgId},'%')
                 AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') >= #{startDate}
                 AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
         </foreach>
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java
index 72872ab638..f67b2fd1cf 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java
@@ -185,8 +185,8 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
         wrapper.like(StringUtils.isNotBlank(formDTO.getName()), IcPartymemberStyleEntity::getName, formDTO.getName());
         wrapper.like(StringUtils.isNotBlank(formDTO.getMainDeed()), IcPartymemberStyleEntity::getMainDeed, formDTO.getMainDeed());
         List<IcPartymemberStyleEntity> list = baseDao.selectList(wrapper);
+        PageInfo<IcPartymemberStyleEntity> pageInfo = new PageInfo<>(list);
         List<IcPartymemberStyleDTO> dtoList = ConvertUtils.sourceToTarget(list, IcPartymemberStyleDTO.class);
-        PageInfo<IcPartymemberStyleDTO> pageInfo = new PageInfo<>(dtoList);
         //设置网格名
         dtoList.forEach(item -> {
             if (StringUtils.isNotBlank(item.getGridId())) {