diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 1d1fac390d..d1c160080d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1194,7 +1194,7 @@ public class DataStatsServiceImpl implements DataStatsService {
                     Integer eventUnResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getEventUnResolvedCount).sum();
                     Integer closedProjectTotal = issueResolvedCount + issueUnResolvedCount+projectResolvedCount
                                                 + projectUnResolvedCount + eventResolvedCount + eventUnResolvedCount;
-                    resultDTO.setProblemResolvedCount(problemResolvedCount);
+                    resultDTO.setProblemResolvedCount(closedProjectTotal);
                     resultDTO.setGroupSelfGovernRatio(getPercentage(inGroupTopicResolvedCount + inGroupTopicUnResolvedCount, problemResolvedCount));
                     resultDTO.setGridSelfGovernRatio(getPercentage(gridSelfGovernProjectTotal, closedProjectTotal));
                     resultDTO.setCommunityResolvedRatio(getPercentage(communityClosedCount, closedProjectTotal));
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index 50221188f9..3ae2108cd1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -599,6 +599,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             log.error("getStaffInfo have any agency staffId:{}",staffId);
             return null;
         }
+        result.setStaffId(staffEntity.getUserId());
         result.setAgencyId(agencyDTO.getId());
         result.setAgencyName(agencyDTO.getOrganizationName());
         result.setAgencyPIds(agencyDTO.getPids());
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 6b60501d4e..e94f7859c3 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -624,7 +624,9 @@
         SELECT
             agency_id AS agencyId,
             `level` AS level,
-            problem_resolved_count AS problemResolvedCount,
+            ISSUE_PROJECT_RESOLVED_COUNT+ISSUE_PROJECT_UN_RESOLVED_COUNT
+            +APPROVAL_PROJECT_RESOLVED_COUNT+APPROVAL_PROJECT_UN_RESOLVED_COUNT
+            +EVENT_RESOLVED_COUNT+EVENT_UN_RESOLVED_COUNT AS problemResolvedCount,
             concat(ROUND(group_self_govern_ratio*100, 1),'%') AS groupSelfGovernRatio,
             concat(ROUND(grid_self_govern_ratio*100, 1),'%') AS gridSelfGovernRatio,
             concat(ROUND(community_closed_ratio*100, 1),'%') AS communityResolvedRatio,
@@ -638,13 +640,15 @@
         <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
             agency_id = #{agencyId}
         </foreach>
-        ORDER BY problem_resolved_count DESC
+        ORDER BY problemResolvedCount DESC
     </select>
 
     <select id="getGridGovern" resultType="com.epmet.dataaggre.dto.datastats.result.GridGovrnResultDTO">
         SELECT
             grid_id AS gridId,
-            problem_resolved_count AS problemResolvedCount,
+            ISSUE_PROJECT_RESOLVED_COUNT+ISSUE_PROJECT_UN_RESOLVED_COUNT
+            +APPROVAL_PROJECT_RESOLVED_COUNT+APPROVAL_PROJECT_UN_RESOLVED_COUNT
+            +EVENT_RESOLVED_COUNT+EVENT_UN_RESOLVED_COUNT AS problemResolvedCount,
             concat(ROUND(group_self_govern_ratio*100, 1),'%') AS groupSelfGovernRatio,
             concat(ROUND(grid_self_govern_ratio*100, 1),'%') AS gridSelfGovernRatio,
             concat(ROUND(community_closed_ratio*100, 1),'%') AS communityResolvedRatio,
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectDifficultRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectDifficultRankResultDTO.java
index f3d1967599..0d6412a35d 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectDifficultRankResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectDifficultRankResultDTO.java
@@ -3,6 +3,7 @@ package com.epmet.project.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -61,4 +62,10 @@ public class ProjectDifficultRankResultDTO implements Serializable {
      * */
     private Integer handledCount;
 
+    /**
+     * 项目评价分数
+     * 直接取整数位展示
+     */
+    private BigDecimal score;
+
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
index 45eeb51736..0c75304942 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java
@@ -242,34 +242,41 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
     @Override
     public List<GovernCapacityRankResultDTO> governCapacityRank(AgencyAndNumFormDTO param) {
         List<GovernCapacityResultDTO> orderList = new ArrayList<>();
-        if(null == param.getTopNum()) param.setTopNum(NumConstant.FIVE);
-        if(NumConstant.ZERO == param.getTopNum()) param.setTopNum(NumConstant.MAX);
+        if(null == param.getTopNum()) {
+            param.setTopNum(NumConstant.FIVE);
+        }
+        if(NumConstant.ZERO == param.getTopNum()) {
+            param.setTopNum(NumConstant.MAX);
+        }
         PageHelper.startPage(NumConstant.ONE,param.getTopNum());
-        String monthId = dateUtils.getCurrentMonthId();
+        String dateId = com.epmet.commons.tools.utils.DateUtils.getBeforeNDay(NumConstant.ONE);
+
         if (StringUtils.isNotEmpty(param.getAreaCode())){
             List<String> nextAgencyIds = screenCustomerAgencyService.getNextAgencyIds(param.getAreaCode(), param.getAgencyId());
             if (CollectionUtils.isEmpty(nextAgencyIds)){
                 return new ArrayList<>();
             }
-            orderList = screenGovernRankDataDao.selectGovernCapacityRatioNew(monthId,nextAgencyIds);
-            int time = NumConstant.TWELVE;
-            while(CollectionUtils.isEmpty(orderList) && time > NumConstant.ONE){
-                time--;
-                monthId = dateUtils.getPreviousMonthIdByDest(null ,monthId);
+            orderList = screenGovernRankDataDao.selectGovernCapacityRatioNew(dateId,nextAgencyIds);
+            int time = NumConstant.ONE;
+            while(CollectionUtils.isEmpty(orderList) && time < NumConstant.TEN){
+                time++;
+                dateId = com.epmet.commons.tools.utils.DateUtils.getBeforeNDay(time);
                 PageHelper.startPage(NumConstant.ONE,param.getTopNum());
-                orderList = screenGovernRankDataDao.selectGovernCapacityRatioNew(monthId,nextAgencyIds);
+                orderList = screenGovernRankDataDao.selectGovernCapacityRatioNew(dateId,nextAgencyIds);
             }
         }else {
-            orderList = screenGovernRankDataDao.selectGovernCapacityRatio(monthId, param.getAgencyId());
-            int time = NumConstant.TWELVE;
-            while (CollectionUtils.isEmpty(orderList) && time > NumConstant.ONE) {
-                time--;
-                monthId = dateUtils.getPreviousMonthIdByDest(null, monthId);
+            orderList = screenGovernRankDataDao.selectGovernCapacityRatio(dateId, param.getAgencyId());
+            int time = NumConstant.ONE;
+            while (CollectionUtils.isEmpty(orderList) && time < NumConstant.TEN) {
+                time++;
+                dateId = com.epmet.commons.tools.utils.DateUtils.getBeforeNDay(time);
                 PageHelper.startPage(NumConstant.ONE, param.getTopNum());
-                orderList = screenGovernRankDataDao.selectGovernCapacityRatio(monthId, param.getAgencyId());
+                orderList = screenGovernRankDataDao.selectGovernCapacityRatio(dateId, param.getAgencyId());
             }
         }
-        if(null == orderList || orderList.isEmpty()) return new ArrayList<>();
+        if(null == orderList || orderList.isEmpty()) {
+            return new ArrayList<>();
+        }
         List<GovernCapacityRankResultDTO> result = new LinkedList<>();
         orderList.forEach(o -> {
             GovernCapacityRankResultDTO rank = new GovernCapacityRankResultDTO();
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java
index 7e7e2864dd..7b6e81d2e0 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java
@@ -200,13 +200,14 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
             logger.info("机关名："+m.getName()+",总数="+m.getTotal());
         }
         //2021.5.25  平音客户热心居民改网格员  sun  start
-        if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) {
+        //2021.121.17 应胡科家要求在改回去
+        /*if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) {
             dimList.forEach(d->{
                 if("热心居民".equals(d.getType())){
                     d.setType("网格员");
                 }
             });
-        }
+        }*/
         //2021.5.25  平音客户热心居民改网格员  sun  end
         return dimList;
     }
@@ -333,13 +334,14 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
             logger.info("网格名："+m.getName()+",总数="+m.getTotal());
         }
         //2021.5.25  平音客户热心居民改网格员  sun  start
-        if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) {
+        //2021.121.17 应胡科家要求在改回去
+        /*if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) {
             dimList.forEach(d->{
                 if("热心居民".equals(d.getType())){
                     d.setType("网格员");
                 }
             });
-        }
+        }*/
         //2021.5.25  平音客户热心居民改网格员  sun  end
         return dimList;
     }
@@ -507,13 +509,14 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
             resultList.add(party);
         }
         //2021.5.25  平音客户热心居民改网格员  sun  start
-        if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) {
+        //2021.121.17 应胡科家要求在改回去
+        /*if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) {
             resultList.forEach(d->{
                 if("热心居民".equals(d.getType())){
                     d.setType("网格员");
                 }
             });
-        }
+        }*/
         //2021.5.25  平音客户热心居民改网格员  sun  end
         return resultList;
     }
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
index fced0091a6..e0e3b9fdae 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
@@ -278,7 +278,9 @@
         diff.EVENT_IMG_URL AS imgUrl,
         floor(diff.EVENT_COST_TIME/60) AS totalHours,
         diff.EVENT_RE_ORG AS reOrg,
-        diff.EVENT_HANDLED_COUNT AS handledCount
+        diff.EVENT_HANDLED_COUNT AS handledCount,
+        CASE WHEN diff.org_type = 'grid' AND diff.EVENT_STATUS_CODE = 'closed' THEN IFNULL(spd.SATISFACTION_SCORE,80)
+             ELSE spd.SATISFACTION_SCORE END AS score
         FROM
         (
             select scg.AREA_CODE,sdd1.* from screen_difficulty_data sdd1
@@ -333,6 +335,7 @@
                 AND sdd2.EVENT_STATUS_CODE  in('closed','10','5')
             </if>
         ) diff
+        LEFT JOIN screen_project_data spd ON (spd.PROJECT_ID = diff.EVENT_ID AND spd.DEL_FLAG = '0' AND spd.CLOSE_CASE_TIME IS NOT NULL and spd.SATISFACTION_SCORE is not null)
         ORDER BY
         CASE #{type}  WHEN 'timelongest' THEN diff.EVENT_COST_TIME
         WHEN 'mosthandled' THEN diff.EVENT_HANDLED_COUNT
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
index 26d9ac136c..abbf1de8e4 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
@@ -14,14 +14,14 @@
             rankData.SATISFACTION_RATIO,
             agency.AGENCY_NAME AS parentAgencyName
         FROM
-            screen_govern_rank_data rankData
+            screen_govern_rank_data_daily rankData
         LEFT JOIN
             screen_customer_agency agency
             ON rankData.PARENT_ID = agency.AGENCY_ID AND agency.DEL_FLAG = '0' AND agency.AGENCY_ID = #{agencyId}
         WHERE
             rankData.DEL_FLAG = '0'
             AND rankData.PARENT_ID = #{agencyId}
-            AND rankData.MONTH_ID = #{monthId}
+            AND rankData.DATE_ID = #{monthId}
         ORDER BY
             rankData.RESPONSE_RATIO DESC
     </select>
@@ -40,7 +40,7 @@
             left join screen_customer_agency pa
                 on(agency.PARENT_AREA_CODE=pa.AREA_CODE
                   and pa.DEL_FLAG='0')
-            left join screen_govern_rank_data rankData
+            left join screen_govern_rank_data_daily rankData
                 ON (agency.AGENCY_ID =rankData.org_id
                   AND rankData.DEL_FLAG = '0'
                   and rankData.org_type='agency')
@@ -50,7 +50,7 @@
             <foreach collection="orgIds" item="orgId" open="(" close=")" separator=",">
                 #{orgId}
             </foreach>
-            AND rankData.MONTH_ID =#{monthId}
+            AND rankData.DATE_ID =#{monthId}
          )
         union
         (
@@ -65,7 +65,7 @@
             FROM screen_customer_grid grid
             left join screen_customer_agency ca
              on (ca.agency_id = grid.parent_agency_id)
-            left join screen_govern_rank_data rankData
+            left join screen_govern_rank_data_daily rankData
              ON (grid.grid_id=rankData.org_id
                AND grid.DEL_FLAG = 0
                and rankData.org_type='grid')
@@ -74,7 +74,7 @@
             <foreach collection="orgIds" item="orgId" open="(" close=")" separator=",">
                 #{orgId}
             </foreach>
-            AND rankData.MONTH_ID =#{monthId}
+            AND rankData.DATE_ID =#{monthId}
         )
         ORDER BY
         RESPONSE_RATIO DESC
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
index ff340e097c..f111a535eb 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
@@ -1069,7 +1069,7 @@
     <select id="selectAgencyClosedProjectStaticDaily" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">
         SELECT
             a.ID AS AGENCY_ID,
-            a.`LEVEL`,
+            b.`LEVEL`,
             COUNT( b.PROJECT_ID ) AS "sum",
             SUM(IF( b.ORG_TYPE = 'department', 1, 0 )) AS "count"
         FROM
@@ -1078,7 +1078,8 @@
             SELECT
                     PROJECT_ID,
                     main.PIDS,
-                    ORG_TYPE
+                    ORG_TYPE,
+                    da.`LEVEL`
             FROM
                     fact_origin_project_main_daily main
             INNER JOIN	fact_origin_project_log_daily log ON main.ID = log.PROJECT_ID
@@ -1086,17 +1087,16 @@
                 AND (ORG_TYPE = 'agency' OR ORG_TYPE = 'department')
                 AND log.DEL_FLAG = '0'
                 AND log.CUSTOMER_ID = #{customerId}
+            INNER JOIN dim_agency da ON log.AGENCY_ID = da.ID AND da.CUSTOMER_ID = #{customerId}
             WHERE
                     main.CUSTOMER_ID = #{customerId}
                     AND main.DATE_ID &lt;= #{dateId}
-
-
             ) b ON b.PIDS LIKE CONCAT( '%', a.ID, '%' )
         WHERE
             a.CUSTOMER_ID = #{customerId}
         GROUP BY
             a.ID,
-            a.`LEVEL`
+            b.`LEVEL`
     </select>
 
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
index 85e8316cd3..9a2ec5b096 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
@@ -200,7 +200,7 @@
                      + s.PERFECT_COUNT * 100
               )/s.SHOULD_EVALUATE_COUNT
                 ,
-                0
+                80
             ) AS score
         FROM
             project_satisfaction_statistics s
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
index c1d5c440e3..ea85e2ce33 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
@@ -115,7 +115,7 @@ public class IcBuildingServiceImpl extends BaseServiceImpl<IcBuildingDao, IcBuil
     @Override
     public List<OptionResultDTO> getBuildingOptions(String neighborHoodId) {
         if (StringUtils.isBlank(neighborHoodId)) {
-            log.error("小区ID为空");
+            log.warn("小区ID为空");
             return Collections.emptyList();
         }
         LambdaQueryWrapper<IcBuildingEntity> wrapper = new LambdaQueryWrapper<>();
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 36475ba740..435f4838f8 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
@@ -2789,4 +2789,4 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		return baseDao.selectByOriginId(originId);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserIdsFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserIdsFormDTO.java
index de8c542864..44da2f6a91 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserIdsFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserIdsFormDTO.java
@@ -2,6 +2,8 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 import java.util.List;
 
@@ -14,5 +16,9 @@ public class UserIdsFormDTO implements Serializable {
 
     private static final long serialVersionUID = -6168528618954442905L;
 
+    @NotBlank(message = "客户ID不能为空")
+    private String customerId;
+
+    @NotEmpty(message = "工作人员Id 不能为空")
     private List<String> userIds;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
index 531d6791ac..4be5398b9e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
@@ -21,7 +21,6 @@ import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.RequirePermission;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
-import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -40,12 +39,10 @@ import com.epmet.excel.CustomerStaffExcel;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.send.SendMqMsgUtil;
 import com.epmet.service.CustomerStaffService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 import java.util.Map;
 
@@ -367,7 +364,8 @@ public class CustomerStaffController {
      * @date 2020/8/13 1:45 下午
      */
     @PostMapping("getstaffinfolist")
-    public Result<List<StaffSinGridResultDTO>> getStaffInfoList(@RequestBody UserIdsFormDTO formDTO){
+    public Result<List<StaffSinGridResultDTO>> getStaffInfoList(@RequestHeader("customerId") String customerId,@RequestBody UserIdsFormDTO formDTO){
+        formDTO.setCustomerId(customerId);
         ValidatorUtils.validateEntity(formDTO);
         return new Result<List<StaffSinGridResultDTO>>().ok(customerStaffService.getStaffInfoList(formDTO));
     }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
index 648c0e8245..e97ba4e662 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.entity.DataScope;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
@@ -54,7 +53,6 @@ import com.epmet.feign.AuthFeignClient;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.OperCrmOpenFeignClient;
-import com.epmet.send.SendMqMsgUtil;
 import com.epmet.service.CustomerStaffService;
 import com.epmet.service.GovStaffRoleService;
 import com.epmet.service.StaffRoleService;
@@ -64,7 +62,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -603,7 +600,31 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 	public List<StaffSinGridResultDTO> getStaffInfoList(UserIdsFormDTO formDTO) {
 		List<String> userIds = formDTO.getUserIds();
 		// 1. 根据userId查询人员基本信息
-		List<StaffSinGridResultDTO> staffInfoList = customerStaffDao.getStaffInfoList(userIds);
+		List<StaffSinGridResultDTO> staffInfoList = new ArrayList<>();
+		userIds.forEach(staffId->{
+			CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), staffId);
+			if (staffInfo ==null){
+				log.error("getStaffInfoList fail customerId:{}, staffId:{} not exist in db",formDTO.getCustomerId(), staffId);
+				return;
+			}
+			StaffSinGridResultDTO resultDTO = new StaffSinGridResultDTO();
+			resultDTO.setStaffId(staffId);
+			resultDTO.setStaffName(staffInfo.getRealName());
+			resultDTO.setHeadPhoto(staffInfo.getHeadPhoto());
+			resultDTO.setGender(staffInfo.getGender());
+
+			List<RoleResultDTO> roleInfoList = new ArrayList<>();
+			staffInfo.getRoleMap().forEach((key,value) ->{
+				RoleResultDTO dto = new RoleResultDTO();
+				dto.setRoleKey(key);
+				dto.setRoleName(value);
+				roleInfoList.add(dto);
+			});
+			resultDTO.setRoleList(roleInfoList);
+			staffInfoList.add(resultDTO);
+		});
+
+		/*List<StaffSinGridResultDTO> staffInfoList = customerStaffDao.getStaffInfoList(userIds);
 		if (staffInfoList.size() == NumConstant.ZERO){
 			return staffInfoList;
 		}
@@ -619,7 +640,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 				}
 			});
 			staffInfo.setRoleList(roleResult);
-		});
+		});*/
 		return staffInfoList;
 	}
 
diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xls
deleted file mode 100644
index 9afbfdd669..0000000000
Binary files a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xls and /dev/null differ