Merge remote-tracking branch 'origin/develop' into develop

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -129,6 +129,7 @@ public enum EpmetErrorCode {
 	OPER_UPLOAD_IMG_TYPE_ERROR(8716, "请上传PNG格式的图片"),
 	OPER_UPLOAD_IMG_SIZE_ERROR(8717, "请上传200*200的图片"),
 	OPER_CORS_CONFIG_ERROR(8718, "跨域配置错误"),
+	ACCESS_CONFIG_ERROR(8719, "权限配置错误"),
 
 	// 党建声音 前端提示 88段
 	DRAFT_CONTENT_IS_NULL(8801, "至少需要添加一个段落"),

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -1130,37 +1130,38 @@ public class DataStatsServiceImpl implements DataStatsService {
         }
         ScreenCustomerAgencyDTO agencyDTO = indexService.getAgencyInfo(formDTO.getAgencyId());
         if (CollectionUtils.isNotEmpty(customerRelation.haveSubCustomer(agencyDTO.getCustomerId()))) {
-
-            List<String> subAgencyIds = indexService.getAgencyByAreaCodeAgencyId(formDTO.getAgencyId(), agencyDTO.getAreaCode());
-            if (CollectionUtils.isEmpty(subAgencyIds)) {
-                subAgencyIds = new ArrayList<>();
-            }
-            subAgencyIds.add(formDTO.getAgencyId());
-            List<FactAgencyGovernDailyEntity> list =  dataStatsDao.getAgencyGovernDaily(subAgencyIds, formDTO.getDateId());
-            if (CollectionUtils.isNotEmpty(list)) {
-                //问题解决总数
-                Integer problemResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity ::getProblemResolvedCount).sum();
-                //未出小组即未转议题的：话题关闭已解决数
-                Integer inGroupTopicResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity ::getInGroupTopicResolvedCount).sum();
-                //未出小组即未转议题的：话题关闭无需解决数
-                Integer inGroupTopicUnResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity ::getInGroupTopicUnResolvedCount).sum();
-                //未出当前网格的，结案项目数
-                Integer gridSelfGovernProjectTotal = list.stream().mapToInt(FactAgencyGovernDailyEntity ::getGridSelfGovernProjectTotal).sum();
-                //由社区结案的项目总数
-                Integer communityClosedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity ::getCommunityClosedCount).sum();
-                //由街道结案的项目总数
-                Integer streetClosedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity ::getStreetClosedCount).sum();
-                //由区直部门结案的项目总数
-                Integer districtDeptClosedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity ::getDistrictDeptClosedCount).sum();
-
-                resultDTO.setProblemResolvedCount(problemResolvedCount);
-                resultDTO.setGroupSelfGovernRatio(getPercentage(inGroupTopicResolvedCount + inGroupTopicUnResolvedCount, problemResolvedCount));
-                resultDTO.setGridSelfGovernRatio(getPercentage(gridSelfGovernProjectTotal, problemResolvedCount));
-                resultDTO.setCommunityResolvedRatio(getPercentage(communityClosedCount, problemResolvedCount));
-                resultDTO.setStreetResolvedRatio(getPercentage(streetClosedCount, problemResolvedCount));
-                resultDTO.setDistrictDeptResolvedRatio(getPercentage(districtDeptClosedCount, problemResolvedCount));
-
-                return resultDTO;
+            if (OrgConstant.PROVINCE.equals(agencyDTO.getLevel()) || OrgConstant.CITY.equals(agencyDTO.getLevel()) || OrgConstant.DISTRICT.equals(agencyDTO.getLevel())) {
+                List<String> subAgencyIds = indexService.getAgencyByAreaCodeAgencyId(formDTO.getAgencyId(), agencyDTO.getAreaCode());
+                if (CollectionUtils.isEmpty(subAgencyIds)) {
+                    subAgencyIds = new ArrayList<>();
+                }
+                subAgencyIds.add(formDTO.getAgencyId());
+                List<FactAgencyGovernDailyEntity> list =  dataStatsDao.getAgencyGovernDaily(subAgencyIds, formDTO.getDateId());
+                if (CollectionUtils.isNotEmpty(list)) {
+                    //问题解决总数
+                    Integer problemResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getProblemResolvedCount).sum();
+                    //未出小组即未转议题的：话题关闭已解决数
+                    Integer inGroupTopicResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getInGroupTopicResolvedCount).sum();
+                    //未出小组即未转议题的：话题关闭无需解决数
+                    Integer inGroupTopicUnResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getInGroupTopicUnResolvedCount).sum();
+                    //未出当前网格的，结案项目数
+                    Integer gridSelfGovernProjectTotal = list.stream().mapToInt(FactAgencyGovernDailyEntity::getGridSelfGovernProjectTotal).sum();
+                    //由社区结案的项目总数
+                    Integer communityClosedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getCommunityClosedCount).sum();
+                    //由街道结案的项目总数
+                    Integer streetClosedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getStreetClosedCount).sum();
+                    //由区直部门结案的项目总数
+                    Integer districtDeptClosedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getDistrictDeptClosedCount).sum();
+
+                    resultDTO.setProblemResolvedCount(problemResolvedCount);
+                    resultDTO.setGroupSelfGovernRatio(getPercentage(inGroupTopicResolvedCount + inGroupTopicUnResolvedCount, problemResolvedCount));
+                    resultDTO.setGridSelfGovernRatio(getPercentage(gridSelfGovernProjectTotal, problemResolvedCount));
+                    resultDTO.setCommunityResolvedRatio(getPercentage(communityClosedCount, problemResolvedCount));
+                    resultDTO.setStreetResolvedRatio(getPercentage(streetClosedCount, problemResolvedCount));
+                    resultDTO.setDistrictDeptResolvedRatio(getPercentage(districtDeptClosedCount, problemResolvedCount));
+
+                    return resultDTO;
+                }
             }
         }
         //1.按日期查询当前组织事件治理指数
@@ -1381,12 +1382,14 @@ public class DataStatsServiceImpl implements DataStatsService {
         if (OrgConstant.AGENCY.equals(formDTO.getOrgType())) {
             ScreenCustomerAgencyDTO agencyDTO = indexService.getAgencyInfo(formDTO.getOrgId());
             if (CollectionUtils.isNotEmpty(customerRelation.haveSubCustomer(agencyDTO.getCustomerId()))) {
-                ScreenGovernRankDataDailyDTO governData = indexService.getGovernRank(formDTO.getOrgId(), agencyDTO.getAreaCode(), formDTO.getDateId());
-                resultDTO.setGovernRatio(getPercentage(governData.getGovernCount(), governData.getClosedCount()));
-                resultDTO.setResolvedRatio(getPercentage(governData.getResolvedCount(), governData.getClosedCount()));
-                resultDTO.setResponseRatio(getPercentage(governData.getResponseCount(), governData.getTransferCount()));
-                resultDTO.setSatisfactionRatio(getPercentage(governData.getSatisfactionCount(), governData.getClosedProjectCount()));
-                return resultDTO;
+                if (OrgConstant.PROVINCE.equals(agencyDTO.getLevel()) || OrgConstant.CITY.equals(agencyDTO.getLevel()) || OrgConstant.DISTRICT.equals(agencyDTO.getLevel())) {
+                    ScreenGovernRankDataDailyDTO governData = indexService.getGovernRank(formDTO.getOrgId(), agencyDTO.getAreaCode(), formDTO.getDateId());
+                    resultDTO.setGovernRatio(getPercentage(governData.getGovernCount(), governData.getClosedCount()));
+                    resultDTO.setResolvedRatio(getPercentage(governData.getResolvedCount(), governData.getClosedCount()));
+                    resultDTO.setResponseRatio(getPercentage(governData.getResponseCount(), governData.getTransferCount()));
+                    resultDTO.setSatisfactionRatio(getPercentage(governData.getSatisfactionCount(), governData.getClosedProjectCount()));
+                    return resultDTO;
+                }
             }
         }
 

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml

@@ -84,7 +84,7 @@
             SUM(RESOLVED_COUNT) AS resolvedCount,
             SUM(CLOSED_COUNT) AS closedCount,
             SUM(GOVERN_COUNT) AS governCount,
-            SUM(SATISFACTION_PROJECT_COUNT) AS satisfactionProjectCount,
+            SUM(SATISFACTION_COUNT) AS satisfactionCount,
             SUM(CLOSED_PROJECT_COUNT) AS closedProjectCount
         FROM
             screen_govern_rank_data_daily

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/RootAgencyFormDTO.java

@@ -21,4 +21,9 @@ public class RootAgencyFormDTO implements Serializable {
     @NotBlank(message = "组织ID不能为空",groups = {RootAgencyFormDTO.AddUserInternalGroup.class})
     private String agencyId;
 
+    /**
+     * token中客户Id
+     */
+    private String customerId;
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/fact/FactIndexController.java

@@ -1,5 +1,7 @@
 package com.epmet.datareport.controller.fact;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.fact.FactIndexService;
@@ -98,8 +100,9 @@ public class FactIndexController {
      * @author sun
      */
     @PostMapping("index/rootagency")
-    public Result<RootAgencyResultDTO> rootAgency(@RequestBody RootAgencyFormDTO formDTO) {
+    public Result<RootAgencyResultDTO> rootAgency(@LoginUser TokenDto tokenDto, @RequestBody RootAgencyFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, RootAgencyFormDTO.AddUserInternalGroup.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         return new Result<RootAgencyResultDTO>().ok(factIndexService.rootAgency(formDTO));
     }
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java

@@ -100,7 +100,7 @@ public interface ScreenCustomerAgencyDao {
      * @Description 根据组织ID判断是否根组织
      * @author sun
      */
-    int selectRootAgency(@Param("agencyId") String agencyId);
+    int selectRootAgency(@Param("agencyId") String agencyId, @Param("customerId") String customerId);
 
     /**
      * desc: 根据orgId获取组织信息

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java

@@ -486,7 +486,7 @@ public class FactIndexServiceImpl implements FactIndexService {
     public RootAgencyResultDTO rootAgency(RootAgencyFormDTO formDTO) {
         RootAgencyResultDTO resultDTO = new RootAgencyResultDTO();
         //1.根据agencyId查询是否为根级组织
-        int num = screenCustomerAgencyDao.selectRootAgency(formDTO.getAgencyId());
+        int num = screenCustomerAgencyDao.selectRootAgency(formDTO.getAgencyId(), formDTO.getCustomerId());
         if (num < NumConstant.ONE) {
             resultDTO.setIsRoot(false);
         }

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml

@@ -116,6 +116,7 @@
             del_flag = '0'
         AND pid = '0'
         AND agency_id = #{agencyId}
+        AND customer_id = #{customerId}
     </select>
 
     <select id="selectRootAgencyIdByBizType" resultType="com.epmet.evaluationindex.screen.dto.result.TreeResultDTO">

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml

@@ -92,13 +92,13 @@
         <if test="orgType != null and orgType != ''">
             <choose>
                 <when test="orgType == 'grid'">
-                    INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    INNER JOIN screen_customer_grid org ON  org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
                 <when test="orgType == 'agency'">
-                    INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.AGENCY_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    INNER JOIN screen_customer_agency org ON  org.AGENCY_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
                   <when test="orgType == 'department'">
-                    INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.DEPT_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    INNER JOIN screen_customer_dept org ON  org.DEPT_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
             </choose>
         </if>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml

@@ -34,16 +34,16 @@
         score.ORG_TYPE orgType
         FROM
         screen_index_data_yearly score
-         <if test="orgType != null and orgType != ''">
+        <if test="orgType != null and orgType != ''">
             <choose>
                 <when test="orgType == 'grid'">
-                    INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    INNER JOIN screen_customer_grid org ON  org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
                 <when test="orgType == 'agency'">
-                    INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.AGENCY_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    INNER JOIN screen_customer_agency org ON  org.AGENCY_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
-                  <when test="orgType == 'department'">
-                    INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.DEPT_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                <when test="orgType == 'department'">
+                    INNER JOIN screen_customer_dept org ON  org.DEPT_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
             </choose>
         </if>

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java

@@ -147,7 +147,11 @@ public class IndexCalculateController {
                 long start = System.currentTimeMillis();
                 Boolean aBoolean = indexCalculateService.indexCalculate(formDTO);
                 if (aBoolean) {
-                    log.error("客户Id：{},monthId：{}，全部指标计算完成，结果:{},总耗时：{}秒", formDTO.getCustomerId(), formDTO.getMonthId(), aBoolean, (System.currentTimeMillis() - start) / 1000);
+                    log.error("客户Id：{},monthId：{}，全部指标计算完成，结果:{},总耗时：{}秒",
+                            formDTO.getCustomerId(),
+                            formDTO.getMonthId(),
+                            aBoolean,
+                            (System.currentTimeMillis() - start) / 1000);
                 }
 
                 redisUtils.delete(RedisKeys.getCustomerStatsCalFlag(formDTO.getCustomerId()));

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java

@@ -61,12 +61,6 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
 
     @Resource
     private ScreenProjectImgDataDao screenProjectImgDataDao;
-    @Resource
-    private ScreenCustomerAgencyDao agencyDao;
-    @Resource
-    private ScreenCustomerDeptDao deptDao;
-    @Resource
-    private ScreenCustomerGridDao gridDao;
 
     @Override
     public PageData<ScreenProjectDataDTO> page(Map<String, Object> params) {
@@ -141,7 +135,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
                 //如果结案 结案时间立项时间；
                 if ("closed_case".equals(projectStatusCode)) {
                     try {
-                        Date createTime = sdf.parse(item.getProjectCreateTime());
+                        Date createTime = item.getProjectCreateTime();
                         Date closeCaseTime = sdf.parse(item.getCloseCaseTime());
 
                         if (closeCaseTime.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 4) {
@@ -159,21 +153,17 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
                     }
                 } else if ("pending".equals(projectStatusCode)) {
                     //如果处理中 当前时间-立项时间；
-                    try {
-                        Date createTime = sdf.parse(item.getProjectCreateTime());
+                    Date createTime = item.getProjectCreateTime();
 
-                        if (today.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 4) {
-                            //如果当前时间-立项时间小于等于4天 未超期 level3
-                            item.setProjectLevel(3);
-                        } else if (today.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 5) {
-                            //如果当前时间-立项时间大于4天小于5天 即将超期 level2
-                            item.setProjectLevel(2);
-                        } else {
-                            //大于5天 已超期 level1
-                            item.setProjectLevel(1);
-                        }
-                    } catch (ParseException e) {
-                        e.printStackTrace();
+                    if (today.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 4) {
+                        //如果当前时间-立项时间小于等于4天 未超期 level3
+                        item.setProjectLevel(3);
+                    } else if (today.getTime() - createTime.getTime() <= 1000 * 60 * 60 * 24 * 5) {
+                        //如果当前时间-立项时间大于4天小于5天 即将超期 level2
+                        item.setProjectLevel(2);
+                    } else {
+                        //大于5天 已超期 level1
+                        item.setProjectLevel(1);
                     }
                 }
             }

epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.20__add_satisfaction_score.sql

@@ -1,5 +1,5 @@
 -- epmet_evaluation_index库执行以下sql：  增加群众不满得分
-alter table screen_project_data add COLUMN  `SATISFACTION_SCORE` decimal(10,6) DEFAULT NULL COMMENT '满意度得分' AFTER LATITUDE;
+alter table `epmet_evaluation_index`.screen_project_data add COLUMN  `SATISFACTION_SCORE` decimal(10,6) DEFAULT NULL COMMENT '满意度得分' AFTER LATITUDE;
 
 ALTER TABLE `epmet_evaluation_index`.`screen_govern_rank_data_daily`
     ADD COLUMN `RESPONSE_COUNT` int(11) NULL COMMENT '响应次数' AFTER `RESPONSE_RATIO`,

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java

@@ -18,10 +18,13 @@ public class AccessConfigAdd4RoletFormDTO {
     // 为角色添加多个操作
     public interface AddMultiOperations4RoleGroup {}
 
-    @NotBlank(message = "角色Key不能为空", groups = { AddSingleOperation4RoleGroup.class })
+    //为角色添加单个操作，从默认配置里面查询，而不从前端传
+    public interface AddSingleOperations4RoleByDefault {}
+
+    @NotBlank(message = "角色Key不能为空", groups = { AddSingleOperation4RoleGroup.class, AddSingleOperations4RoleByDefault.class })
     private String roleKey;
 
-    @NotBlank(message = "操作Key不能为空", groups = { AddSingleOperation4RoleGroup.class })
+    @NotBlank(message = "操作Key不能为空", groups = { AddSingleOperation4RoleGroup.class, AddSingleOperations4RoleByDefault.class })
     private String operationKey;
 
     private List<String> scopeKeys;

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java

@@ -135,6 +135,22 @@ public class AccessConfigController {
         return new Result();
     }
 
+    /**
+     * @Description 根据默认配置，为所有客户的某角色，配置某操作及其范围
+     * @return
+     * @author wxz
+     * @date 2021.07.01 16:07
+    */
+    @PostMapping("add-ope-and-scopes-4role/by-default-conf")
+    public Result addOpeAndScopes4RoleByDefaultConf(@RequestBody AccessConfigAdd4RoletFormDTO form) {
+        ValidatorUtils.validateEntity(form, AccessConfigAdd4RoletFormDTO.AddSingleOperations4RoleByDefault.class);
+        String roleKey = form.getRoleKey();
+        String operationKey = form.getOperationKey();
+
+        accessConfigService.addOpeAndScopes4RoleByDefaultConf(roleKey, operationKey);
+        return new Result();
+    }
+
     /**
      * @Description 给角色添加单个操作权限和操作范围
      * @return

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java

@@ -29,4 +29,6 @@ public interface AccessConfigService {
     void addOpeAndScopes4Role(String roleKey, String operationKey, List<String> scopeKeys);
 
     void addOpesAndScopes4Role(String roleKey, List<AccessConfigAdd4RoletFormDTO.OperationsAndScopes> operations);
+
+    void addOpeAndScopes4RoleByDefaultConf(String roleKey, String operationKey);
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.Result;
@@ -276,4 +277,24 @@ public class AccessConfigServiceImpl implements AccessConfigService {
             addOpeAndScopes4Role(roleKey, operationKey, scopeKeys);
         }
     }
+
+    @Override
+    public void addOpeAndScopes4RoleByDefaultConf(String roleKey, String operationKey) {
+        // 1.先判断该角色是否已经为该操作配做了默认配置
+        LambdaQueryWrapper<RoleOperationDefaultEntity> rodw = new LambdaQueryWrapper<>();
+        rodw.eq(RoleOperationDefaultEntity::getRoleKey, roleKey);
+        rodw.eq(RoleOperationDefaultEntity::getOperationKey, operationKey);
+        rodw.eq(RoleOperationDefaultEntity::getDelFlag, 0);
+        Integer roleOperationCount = roleOperationDefaultDao.selectCount(rodw);
+        List<OperationScopeDefaultEntity> scopes = operationScopeDefaultDao.listOpeDefaultScopesByRoleAndOpeKey(roleKey, operationKey);
+        if (roleOperationCount == 0 || CollectionUtils.isEmpty(scopes)) {
+            throw new RenException(EpmetErrorCode.ACCESS_CONFIG_ERROR.getCode(), String.format("为所有客户同步%s的%s配置权限默认失败，请先保存默认权限配置再重试", roleKey, operationKey));
+        }
+
+        // 2.开始执行同步
+        List<String> scopeKeys = scopes.stream().map(s -> s.getScopeKey()).collect(Collectors.toList());
+        logger.info(String.format("为所有客户同步%s的%s配置权限，范围列表:" + scopeKeys, roleKey, operationKey));
+        addOpeAndScopes4Role(roleKey, operationKey, scopeKeys);
+        logger.info("同步完成");
+    }
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/RoleInfoResultDTO.java

@@ -31,4 +31,6 @@ public class RoleInfoResultDTO implements Serializable{
     private Boolean fullTimeOnly = false;
 
     private String roleKey;
+
+    private String description;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInfoResultDTO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author zhaoqifeng
@@ -37,4 +38,6 @@ public class StaffInfoResultDTO implements Serializable {
 	 */
 	@JsonInclude(JsonInclude.Include.NON_NULL)
 	private String roleName;
+
+	List<String> roles;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffRoleResultDTO.java

@@ -30,4 +30,6 @@ public class StaffRoleResultDTO implements Serializable {
 	 */
 	@JsonInclude(JsonInclude.Include.NON_NULL)
 	private Boolean selected;
+
+	private String description;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java

@@ -47,6 +47,14 @@ public interface GovStaffRoleDao extends BaseDao<GovStaffRoleEntity> {
      */
     List<GovStaffRoleEntity> listRolesByStaffId(@Param("staffId") String staffId, @Param("orgId") String orgId);
 
+    /**
+     * 根据staffId查询具有的角色列表
+     * @param staffId
+     * @param orgId
+     * @return
+     */
+    List<GovStaffRoleEntity> getStaffRoles(@Param("staffIds") List<String> staffId, @Param("orgId") String orgId);
+
     /**
      * 获取客户机关角色列表
      * @param params

epmet-user/epmet-user-server/src/main/java/com/epmet/service/GovStaffRoleService.java

@@ -105,6 +105,16 @@ public interface GovStaffRoleService extends BaseService<GovStaffRoleEntity> {
      */
     List<GovStaffRoleEntity> listRolesByStaffId(String staffId, String orgId);
 
+    /**
+     * 查询用户角色
+     * @author zhaoqifeng
+     * @date 2021/7/1 15:30
+     * @param staffIds
+     * @param orgId
+     * @return java.util.Map<java.lang.String,java.util.List<java.lang.String>>
+     */
+    Map<String, List<String>> getStaffRoles(List<String> staffIds, String orgId);
+
     /**
      * 获取当前机关下的角色列表
      * @param dto

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -226,6 +226,12 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		if (null == list) {
 			list = new ArrayList<>();
 		}
+		if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(list)) {
+			Map<String, List<String>> map =  govStaffRoleService.getStaffRoles(fromDTO.getStaffList(), fromDTO.getAgencyId());
+			list.forEach(item -> {
+				item.setRoles(map.get(item.getStaffId()));
+			});
+		}
 		return new Result<List<StaffInfoResultDTO>>().ok(list);
 	}
 
@@ -245,6 +251,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 					staffRoleResultDTO.setRoleId(p.getId());
 					staffRoleResultDTO.setRoleName(p.getRoleName());
 					staffRoleResultDTO.setFullTimeOnly(p.getFullTimeOnly());
+					staffRoleResultDTO.setDescription(p.getDescription());
 					return staffRoleResultDTO;
 				}).collect(Collectors.toList());
 		return new Result<List<RoleInfoResultDTO>>().ok(staffRoleList);
@@ -277,6 +284,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 					staffRoleResultDTO.setRoleId(p.getId());
 					staffRoleResultDTO.setRoleName(p.getRoleName());
 					staffRoleResultDTO.setFullTimeOnly(p.getFullTimeOnly());
+					staffRoleResultDTO.setDescription(p.getDescription());
 					staffRoleResultDTO.setSelected(false);
 					return staffRoleResultDTO;
 				}).collect(Collectors.toList());

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java

@@ -45,6 +45,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 政府端角色表
@@ -134,6 +137,22 @@ public class GovStaffRoleServiceImpl extends BaseServiceImpl<GovStaffRoleDao, Go
         return baseDao.listRolesByStaffId(staffId, orgId);
     }
 
+    /**
+     * 查询用户角色
+     *
+     * @param staffIds
+     * @param orgId
+     * @return java.util.Map<java.lang.String, java.util.List < java.lang.String>>
+     * @author zhaoqifeng
+     * @date 2021/7/1 15:30
+     */
+    @Override
+    public Map<String, List<String>> getStaffRoles(List<String> staffIds, String orgId) {
+        List<GovStaffRoleEntity> staffRoleList = baseDao.getStaffRoles(staffIds, orgId);
+        return staffRoleList.stream().collect(Collectors.groupingBy(GovStaffRoleEntity::getCustomerId,
+                Collectors.mapping(GovStaffRoleEntity :: getId, Collectors.toList())));
+    }
+
     @Override
     public List<GovStaffRoleDTO> getGovStaffRoleList(GovStaffRoleDTO dto) {
         return baseDao.selectGovStaffRoleList(dto);

epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml

@@ -138,6 +138,23 @@
               </foreach>
             )
     </select>
+    <select id="getStaffRoles" resultType="com.epmet.entity.GovStaffRoleEntity">
+        SELECT
+            sr.STAFF_ID AS customerId,
+           r.ID,
+           r.ROLE_KEY,
+           r.ROLE_NAME
+        FROM
+            staff_role sr
+                INNER JOIN gov_staff_role r ON ( sr.ROLE_ID = r.ID ) AND r.DEL_FLAG = '0'
+        WHERE
+            sr.DEL_FLAG = '0'
+          AND sr.ORG_ID = #{orgId}
+        <foreach collection="staffIds" item="staffId" open="AND ( " separator=" OR " close=" ) ">
+            sr.STAFF_ID = #{staffId}
+        </foreach>
+        ORDER BY r.SORT asc
+    </select>
 
     <update id="upNameOrDescription">
         UPDATE gov_staff_role