diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java
index b6eeff0053..d189574ef3 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDistributionFormDTO.java
@@ -21,6 +21,7 @@ public class ScreenProjectDistributionFormDTO implements Serializable {
 
     /**
      * 如果为空返回全部；可选值：1:红色事件；2：黄色事件；3：绿色事件
+     * all:全部
      */
     @NotBlank(message = "level不能为空")
     private String level;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java
index ec2c9e5219..a45acf622c 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java
@@ -37,4 +37,10 @@ public class ScreenProjectDistributionResultDTO implements Serializable {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date projectCreateTime;
+
+
+    /**
+     * 分类名称 add 21.09.9
+     */
+    private String categoryName;
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
index 543b9d3eb4..a4a6582cf2 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
@@ -12,7 +12,8 @@
             longitude AS longitude,
             latitude AS latitude,
             PROJECT_CREATE_TIME AS projectCreateTime,
-            CUSTOMER_ID AS customerId
+            CUSTOMER_ID AS customerId,
+            ALL_CATEGORY_NAME as categoryName
         FROM
             screen_project_data
         WHERE
@@ -30,26 +31,23 @@
             <if test="ids == null and agencyId != null">
                 and org_id = #{agencyId}
             </if>
-
-            <choose>
-                <when test='level != null and "1" == level'>
-                    and PROJECT_STATUS_CODE ='pending'
-                </when>
-                <when test='level != null and "2" == level'>
-                    and PROJECT_STATUS_CODE ='pending'
-                </when>
-                <when test='level != null and "3" == level'>
-                    and PROJECT_STATUS_CODE !='pending'
-                    and DATE_SUB(CURDATE(), INTERVAL 30 DAY) &lt;= date(PROJECT_CREATE_TIME)
-                </when>
-                <otherwise>
-                    and PROJECT_STATUS_CODE ='pending'
-                </otherwise>
-            </choose>
+            <if test='level != null and "1" == level'>
+                and PROJECT_STATUS_CODE ='pending'
+            </if>
+            <if test='level != null and "2" == level'>
+                and PROJECT_STATUS_CODE ='pending'
+            </if>
+            <if test='level != null and "3" == level'>
+                and PROJECT_STATUS_CODE !='pending'
+                and DATE_SUB(CURDATE(), INTERVAL 30 DAY) &lt;= date(PROJECT_CREATE_TIME)
+            </if>
         order by PROJECT_CREATE_TIME desc
         <if test='level != null and "3" == level'>
             LIMIT #{pageSize}
         </if>
+        <if test='level != null and "all" == level'>
+            LIMIT #{pageSize}
+        </if>
     </select>
     <select id="selectIdsByAreaCode" resultType="java.lang.String">
         select agency_id as id from screen_customer_agency where del_flag = '0' and area_code like concat(#{areaCode},'%')
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
index d1124fe9b8..641d5fbe9f 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java
@@ -18,14 +18,17 @@ public class GroupPointFormDTO implements Serializable {
 
 	public interface GroupPoint extends CustomerClientShowGroup {}
 	public interface GridRank extends CustomerClientShowGroup {}
-	public interface GridScopeRank extends CustomerClientShowGroup {}
-	public interface CustomerScopeRank extends CustomerClientShowGroup {}
+	public interface GridScopeRank {}
+	public interface CustomerScopeRank {}
+	public interface MyGroupRank {}
 	@NotBlank(message = "小组Id不能为空", groups = {GroupPoint.class, GridRank.class})
 	private String groupId;
-	@NotBlank(message = "网格Id不能为空", groups = {GridRank.class, GridScopeRank.class})
+	@NotBlank(message = "网格Id不能为空", groups = {GridRank.class, GridScopeRank.class, MyGroupRank.class})
 	private String gridId;
 	@NotBlank(message = "客户Id不能为空", groups = {CustomerScopeRank.class})
 	private String customerId;
+	@NotBlank(message = "用户ID不能为空", groups = {MyGroupRank.class})
+	private String userId;
 
 	/** 页码 */
 	private Integer pageNo = 1;
diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java
index b99d4313ac..2f06640b73 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/GroupPointRankingResultDTO.java
@@ -47,4 +47,10 @@ public class GroupPointRankingResultDTO implements Serializable {
 
 	/** 所属网格名称 */
 	private String gridNamePath;
+
+	/** 网格内排名 */
+	private Integer gridRanking;
+
+	/** 客户下总排名 */
+	private Integer customerRanking;
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
index 1ff898d97d..d2901df068 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java
@@ -133,7 +133,7 @@ public class GroupPointController {
 		Integer pageNo = formDTO.getPageNo();
 		Integer pageSize = formDTO.getPageSize();
 
-		PageData<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInGridScope(SearchScopeTypeEnum.GRID, gridId,pageNo, pageSize);
+		PageData<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInPercificScope(SearchScopeTypeEnum.GRID, gridId,pageNo, pageSize);
 		return new Result<PageData<GroupPointRankingResultDTO>>().ok(page);
 	}
 
@@ -152,8 +152,24 @@ public class GroupPointController {
 		Integer pageNo = formDTO.getPageNo();
 		Integer pageSize = formDTO.getPageSize();
 
-		PageData<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInGridScope(SearchScopeTypeEnum.CUSTOMER, customerId, pageNo, pageSize);
+		PageData<GroupPointRankingResultDTO> page = bizPointTotalDetailService.listGroupPointRandingInPercificScope(SearchScopeTypeEnum.CUSTOMER, customerId, pageNo, pageSize);
 		return new Result<PageData<GroupPointRankingResultDTO>>().ok(page);
 	}
 
+	/**
+	 * @description 【小组排名】- 列出我所在的小组的积分排名
+	 *
+	 * @param formDTO
+	 * @return
+	 * @author wxz
+	 * @date 2021.09.08 13:31:09
+	 */
+	@PostMapping("grouppointranking/mygroups")
+	public Result<List<GroupPointRankingResultDTO>> listMyGroupPointRanding(@RequestBody GroupPointFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.MyGroupRank.class);
+		String userId = formDTO.getUserId();
+		String gridId = formDTO.getGridId();
+		List<GroupPointRankingResultDTO> list = bizPointTotalDetailService.listMyGroupPointRanding(userId, gridId);
+		return new Result<List<GroupPointRankingResultDTO>>().ok(list);
+	}
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/BizPointTotalDetailDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/BizPointTotalDetailDao.java
index 26e05f5a7b..1fb34f99e7 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/BizPointTotalDetailDao.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/BizPointTotalDetailDao.java
@@ -40,4 +40,27 @@ public interface BizPointTotalDetailDao extends BaseDao<BizPointTotalDetailEntit
 	 * @return com.epmet.dto.BizPointTotalDetailDTO
 	 */
 	BizPointTotalDetailDTO selectDataByObject(@Param("type")String type, @Param("objectId")String objectId);
+
+	/**
+	 * @description 查询object在指定范围内的排名
+	 *
+	 * @param bizType
+	 * @param groupId
+	 * @param scope
+	 * @return
+	 * @author wxz
+	 * @date 2021.09.08 17:36:17
+	 */
+    Integer getRanking(@Param("bizType") String bizType, @Param("groupId") String groupId, @Param("scope") String scope);
+
+    /**
+     * @description 搜索指定范围内，最低名次
+     *
+     * @param scope
+     * @param scopeId
+     * @return
+     * @author wxz
+     * @date 2021.09.09 09:53:37
+     */
+    Integer getMinRanking(@Param("bizType") String bizType,@Param("searchScope") String scope, @Param("searchScopeId") String scopeId);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
index 0b64de14bc..94204eb3ed 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java
@@ -148,5 +148,16 @@ public interface BizPointTotalDetailService extends BaseService<BizPointTotalDet
 	 * @author wxz
 	 * @date 2021.09.07 14:18:08
 	 */
-	PageData<GroupPointRankingResultDTO> listGroupPointRandingInGridScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize);
+	PageData<GroupPointRankingResultDTO> listGroupPointRandingInPercificScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize);
+
+	/**
+	 * @description 【小组排名】- 列出我所在的小组的积分排名
+	 *
+	 * @param userId
+	 * @param gridId
+	 * @return
+	 * @author wxz
+	 * @date 2021.09.08 13:34:49
+	 */
+	List<GroupPointRankingResultDTO> listMyGroupPointRanding(String userId, String gridId);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
index 29723b68a2..037779147b 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java
@@ -41,11 +41,13 @@ import com.epmet.dto.form.GroupPointFormDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.resi.group.dto.group.form.GroupFormDTO;
 import com.epmet.resi.group.dto.group.form.GroupPointDetailFormDTO;
+import com.epmet.resi.group.dto.group.form.GroupsByMemberFormDTO;
 import com.epmet.resi.group.dto.group.result.GroupDetailResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO;
 import com.epmet.dto.result.GroupPointRankingResultDTO;
 import com.epmet.entity.BizPointTotalDetailEntity;
 import com.epmet.resi.group.dto.group.ResiGroupDTO;
+import com.epmet.resi.group.dto.group.result.RankingResultDTO;
 import com.epmet.resi.group.enums.SearchScopeTypeEnum;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.service.BizPointTotalDetailService;
@@ -261,7 +263,7 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
     }
 
     @Override
-    public PageData<GroupPointRankingResultDTO> listGroupPointRandingInGridScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize) {
+    public PageData<GroupPointRankingResultDTO> listGroupPointRandingInPercificScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize) {
 
         // 1.查询有积分的小组得分排名
         PageInfo<BizPointTotalDetailEntity> entityPageInfo = PageHelper.startPage(pageNo, pageSize).doSelectPageInfo(() -> {
@@ -306,14 +308,21 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
             rankingInfoDTOs.addAll(gap);
         }
 
-        // 4.排名填充
+        // 4.排名填充。有积分的按照积分排序，分数一样的名次一样
         Integer ranking = page.getStartRow() + 1;
+        Integer prevPoint = null;
         for (GroupPointRankingResultDTO g : rankingInfoDTOs) {
+            Integer point = Integer.valueOf(g.getPoint());
+            if (prevPoint != null && prevPoint > point) {
+                // 此举是为了在积分一样的情况下，给与相同的排名
+                ranking ++;
+            }
+
             GridInfoCache gridInfo = getGridInfo(g.getGridId());
-            g.setRanking(String.valueOf(ranking));
             g.setGridId(g.getGridId());
             g.setGridNamePath(gridInfo.getGridNamePath());
-            ranking ++;
+            g.setRanking(String.valueOf(ranking));
+            prevPoint = point;
         }
         PageData<GroupPointRankingResultDTO> pageData = new PageData<>(rankingInfoDTOs, entityPageInfo.getTotal());
         return pageData;
@@ -422,4 +431,61 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
         ope.putAll(RedisKeys.getGridInfoKey(gridId), BeanUtil.beanToMap(cache));
         return cache;
     }
+
+    @Override
+    public List<GroupPointRankingResultDTO> listMyGroupPointRanding(String userId, String gridId) {
+        // 1.查询网格内我所在的小组
+        GroupsByMemberFormDTO form = new GroupsByMemberFormDTO();
+        form.setGridId(gridId);
+        form.setUserId(userId);
+        List<GroupDetailResultDTO> groupList = getResultDataOrThrowsException(resiGroupOpenFeignClient.listGroupsByMember(form),
+                ServiceConstant.RESI_GROUP_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "【我所在的小组排名】查询组列表失败");
+
+        if (CollectionUtils.isEmpty(groupList)) {
+            return new ArrayList();
+        }
+
+        // 2.填充分数和排名
+        GroupDetailResultDTO firstGroup = groupList.get(0);
+
+        // 网格和客户下，分别有多少个有积分的小组，后面用于给哪些没有任何积分记录的小组排名
+        Integer gridMinRanking = baseDao.getMinRanking("group", "grid", gridId);
+        Integer customerMinRanking = baseDao.getMinRanking("group", "customer", firstGroup.getCustomerId());
+
+        List<GroupPointRankingResultDTO> groupDtoList = groupList.stream().map(g -> {
+            // 积分
+            Integer point = 0;
+            // 网格内的排名
+            Integer gridRanking = null;
+            // 客户下的排名
+            Integer customerRanking = null;
+
+            LambdaQueryWrapper<BizPointTotalDetailEntity> query = new LambdaQueryWrapper<>();
+            query.eq(BizPointTotalDetailEntity::getBizType, "group");
+            query.eq(BizPointTotalDetailEntity::getObjectId, g.getGroupId());
+            BizPointTotalDetailEntity groupPoint = baseDao.selectOne(query);
+            if (groupPoint == null) {
+                // 该小组没有积分
+                gridRanking = gridMinRanking + 1;
+                customerRanking = customerMinRanking + 1;
+            } else {
+                // 该小组有积分
+                point = groupPoint.getTotalPoint();
+                gridRanking = baseDao.getRanking("group", g.getGroupId(), "grid");
+                customerRanking = baseDao.getRanking("group", g.getGroupId(), "customer");
+            }
+
+            GroupPointRankingResultDTO dto = new GroupPointRankingResultDTO();
+            dto.setGridId(g.getGridId());
+            dto.setGroupHeadPhoto(g.getGroupHeadPhoto());
+            dto.setGroupType(g.getGroupType());
+            dto.setGroupId(g.getGroupId());
+            dto.setGroupName(g.getGroupName());
+            dto.setPoint(point.toString());
+            dto.setGridRanking(gridRanking);
+            dto.setCustomerRanking(customerRanking);
+            return dto;
+        }).collect(Collectors.toList());
+        return groupDtoList;
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/BizPointTotalDetailDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/BizPointTotalDetailDao.xml
index e1e8202e83..e65cfbabf5 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/BizPointTotalDetailDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/BizPointTotalDetailDao.xml
@@ -29,5 +29,51 @@
         and OBJECT_ID = #{objectId}
     </select>
 
+    <!--查询object在指定范围内的排名-->
+    <select id="getRanking" resultType="java.lang.Integer">
+        select count(distinct p_2.TOTAL_POINT) + 1 as ranking
+        from biz_point_total_detail point
+            inner join biz_point_total_detail p_2
+                on (point.BIZ_TYPE = p_2.BIZ_TYPE and p_2.DEL_FLAG = 0 and
+                point.TOTAL_POINT &lt; p_2.TOTAL_POINT
+                <if test="scope == 'grid'">
+                    and point.GRID_ID = p_2.GRID_ID
+                </if>
+                <if test="scope == 'customer'">
+                    and point.CUSTOMER_ID = p_2.CUSTOMER_ID
+                </if>
+                )
+        where
+            point.OBJECT_ID = #{groupId}
+            and point.BIZ_TYPE = #{bizType}
+            and point.DEL_FLAG = 0
+    </select>
+
+    <!--获取指定范围内最低排名。子查询是取最低分的那个对象出来-->
+    <select id="getMinRanking" resultType="java.lang.Integer">
+        select count(distinct p.TOTAL_POINT) + 1 as ranking
+        from biz_point_total_detail p
+                 inner join
+             (select point.OBJECT_ID, point.BIZ_TYPE, point.GRID_ID, point.CUSTOMER_ID, point.TOTAL_POINT
+              from biz_point_total_detail point
 
+              where point.BIZ_TYPE = #{bizType}
+                and point.DEL_FLAG = 0
+                <if test="searchScope == 'grid'">
+                    and point.GRID_ID = #{searchScopeId}
+                </if>
+                <if test="searchScope == 'customer'">
+                    and point.CUSTOMER_ID = #{searchScopeId}
+                </if>
+              order by point.TOTAL_POINT asc limit 1) t
+              on (p.BIZ_TYPE = t.BIZ_TYPE
+                  and p.TOTAL_POINT > t.TOTAL_POINT
+                  <if test="searchScope == 'grid'">
+                      and p.GRID_ID = t.GRID_ID
+                  </if>
+                    <if test="searchScope == 'customer'">
+                        and p.CUSTOMER_ID = t.CUSTOMER_ID
+                    </if>
+                  )
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
index f66c547f6c..3b31e4feac 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
@@ -215,6 +215,10 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
     @Override
     public Result<CustomerDTO> getCustomerInfo(CustomerDTO dto) {
         CustomerEntity entity = baseDao.selectById(dto.getId());
+        if (null == entity) {
+            log.warn(String.format("当前客户id：%s,已删除", dto.getId()));
+            return new Result();
+        }
         List<String> customerIds=customerRelationService.getAllSubCustomerIds(dto.getId());
         CustomerDTO customerDTO=ConvertUtils.sourceToTarget(entity, CustomerDTO.class);
         if(CollectionUtils.isEmpty(customerIds)){
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupsByMemberFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupsByMemberFormDTO.java
new file mode 100644
index 0000000000..806b07629e
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupsByMemberFormDTO.java
@@ -0,0 +1,17 @@
+package com.epmet.resi.group.dto.group.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description 根据成员查询组列表form
+ * @author wxz
+ * @date 2021.09.08 14:12:44
+*/
+@Data
+public class GroupsByMemberFormDTO {
+    private String gridId;
+    @NotNull(message = "成员用户ID不能为空")
+    private String userId;
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupDetailResultDTO.java
index 93247725a4..fd585419a2 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupDetailResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupDetailResultDTO.java
@@ -21,5 +21,5 @@ public class GroupDetailResultDTO {
     private String remark;
     /** 群组类型:branch:支部小组，ordinary:楼院小组 */
     private String groupType;
-
+    private String customerId;
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RankingResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RankingResultDTO.java
new file mode 100644
index 0000000000..99357eb400
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RankingResultDTO.java
@@ -0,0 +1,11 @@
+package com.epmet.resi.group.dto.group.result;
+
+import lombok.Data;
+
+@Data
+public class RankingResultDTO {
+
+    private Integer gridRanking;
+    private Integer customerRanking;
+
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
index 5f92693338..c95abb1044 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
@@ -311,4 +311,14 @@ public interface ResiGroupOpenFeignClient {
     @PostMapping("/resi/group/group/list-groupinfos-exclude-groupids")
     Result<List<GroupDetailResultDTO>> listGroupDetailsExcludeGroupIds(@RequestBody GroupFormDTO form);
 
+    /**
+     * @description 根据组成员查询所在的小组列表。可选条件包括:grid
+     *
+     * @param formDTO
+     * @return
+     * @author wxz
+     * @date 2021.09.08 13:51:05
+     */
+    @PostMapping("/resi/group/group/list-groups-by-member")
+    Result<List<GroupDetailResultDTO>> listGroupsByMember(@RequestBody GroupsByMemberFormDTO formDTO);
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
index 23f2e25526..11d0514d5e 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
@@ -242,4 +242,9 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
     public Result<List<GroupDetailResultDTO>> listGroupDetailsExcludeGroupIds(GroupFormDTO form) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "listGroupDetailsExcludeGroupIds", form);
     }
+
+    @Override
+    public Result<List<GroupDetailResultDTO>> listGroupsByMember(GroupsByMemberFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "listGroupsByMember", formDTO);
+    }
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
index e11508dc36..6195fbf2e9 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
@@ -636,4 +636,21 @@ public class ResiGroupController {
         List<GroupDetailResultDTO> groups = resiGroupService.listGroupDetailsExcludeGroupIds(excludeGroupIds, startRow, rowCount, searchScopeType.getScopeType(), searchScopeObjectId, sort.getSortField(), order.getOrderType());
         return new Result<List<GroupDetailResultDTO>>().ok(groups);
     }
+
+    /**
+     * @description 根据组成员查询所在的小组列表。可选条件包括:grid
+     *
+     * @param formDTO
+     * @return
+     * @author wxz
+     * @date 2021.09.08 13:51:05
+     */
+    @PostMapping("list-groups-by-member")
+    public Result<List<GroupDetailResultDTO>> listGroupsByMember(@RequestBody GroupsByMemberFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        String gridId = formDTO.getGridId();
+        String userId = formDTO.getUserId();
+        List<GroupDetailResultDTO> groups = resiGroupService.listGroupsByMember(userId, gridId);
+        return new Result<List<GroupDetailResultDTO>>().ok(groups);
+    }
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
index 4e1679723c..3a0b47c336 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
@@ -302,15 +302,6 @@ public interface ResiGroupDao extends BaseDao<ResiGroupEntity> {
 	 */
 	List<UnReadListResultDTO> selectUnReadInfos(@Param("ids")List<String> ids);
 
-	/**
-	 * 我所在小组最近完成的成就
-	 * @author zhaoqifeng
-	 * @date 2021/4/22 9:47
-	 * @param userId
-	 * @return java.util.List<com.epmet.resi.group.dto.member.result.GroupAchievementDTO>
-	 */
-	List<GroupAchievementDTO> selectRecentGroupAchievements(@Param("userId") String userId, @Param("gridId") String gridId);
-
 	/**
 	 * @Description  根据IDs查询 topic，act，notice信息
 	 * @Param ids
@@ -335,4 +326,24 @@ public interface ResiGroupDao extends BaseDao<ResiGroupEntity> {
 	 * @date 2021/4/25 上午9:10
 	 */
 	List<ReadStatusResultDTO> selectReadFlagByUserAndId(@Param("ids")List<String> ids,@Param("userIds")List<String> userIds);
+
+	/**
+	 * 我所在小组最近完成的成就
+	 * @author zhaoqifeng
+	 * @date 2021/4/22 9:47
+	 * @param userId
+	 * @return java.util.List<com.epmet.resi.group.dto.member.result.GroupAchievementDTO>
+	 */
+	List<GroupAchievementDTO> selectRecentGroupAchievements(@Param("userId") String userId, @Param("gridId") String gridId);
+
+	/**
+	 * @description 根据组成员查询所在组列表。如有需要，可以增加其他if条件，或者增加排序参数
+	 *
+	 * @param memberUserId
+	 * @param gridId
+	 * @return
+	 * @author wxz
+	 * @date 2021.09.08 14:00:52
+	 */
+	List<GroupDetailResultDTO> listGroupsByMember(@Param("memberUserId") String memberUserId, @Param("gridId") String gridId);
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
index eed7a355e6..122083cceb 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
@@ -461,4 +461,15 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @date 2021.09.07 17:17:09
 	 */
 	List<GroupDetailResultDTO> listGroupDetailsExcludeGroupIds(List<String> excludeGroupIds, Integer startRow, Integer rowCount, String searchScopeType,String searchScopeObjectId, String sortType, String orderType);
+
+	/**
+	 * @description 根据成员查询组列表
+	 *
+	 * @param memberUserId
+	 * @param gridId
+	 * @return
+	 * @author wxz
+	 * @date 2021.09.08 13:59:31
+	 */
+	List<GroupDetailResultDTO> listGroupsByMember(String memberUserId, String gridId);
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index e7b21ba01c..0cc90c660b 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -40,6 +40,7 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ReadFlagConstant;
+import com.epmet.dto.BizPointTotalDetailDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
@@ -1834,4 +1835,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			return dto;
 		}).collect(Collectors.toList());
 	}
+
+	@Override
+	public List<GroupDetailResultDTO> listGroupsByMember(String memberUserId, String gridId) {
+		return baseDao.listGroupsByMember(memberUserId, gridId);
+	}
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
index 69fef4786a..a370c9e41c 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
@@ -1065,4 +1065,22 @@
         ORDER BY releaseTime DESC
     </select>
 
+    <select id="listGroupsByMember" resultType="com.epmet.resi.group.dto.group.result.GroupDetailResultDTO">
+        select resi_group.ID as groupId,
+               resi_group.GRID_ID,
+               resi_group.GROUP_HEAD_PHOTO,
+               resi_group.GROUP_NAME,
+               resi_group.GROUP_INTRODUCTION,
+               resi_group.GROUP_TYPE,
+               resi_group.CUSTOMER_ID
+        from resi_group
+                 inner join resi_group_member
+                            on (resi_group.ID = resi_group_member.RESI_GROUP_ID and resi_group_member.DEL_FLAG = 0)
+        where resi_group_member.CUSTOMER_USER_ID = #{memberUserId}
+          and resi_group.DEL_FLAG = 0
+          <if test="gridId != null and gridId.trim() != ''">
+              and resi_group.GRID_ID=#{gridId}
+          </if>
+        order by resi_group.CREATED_TIME desc
+    </select>
 </mapper>
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java
index bdf908849f..3f189b5426 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java
@@ -334,7 +334,7 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
         CustomerDTO customerDTO = new CustomerDTO();
         customerDTO.setId(dto.getCustomerId());
         Result<CustomerDTO> customerInfo = operCrmOpenFeignClient.getCustomerInfo(customerDTO);
-        if (customerInfo.success()){
+        if (customerInfo.success() && null != customerInfo.getData()) {
             userAdviceDTO.setCustomerName(customerInfo.getData().getCustomerName());
         }else {
             logger.error("customerId:{},获取customerName失败",dto.getCustomerId());