From 0605d6f275848001a0cf00b5f5d12ba40642ed28 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Tue, 27 Jul 2021 12:01:10 +0800 Subject: [PATCH] 1、guoliuangongneng --- zq-erp/src/main/resources/config/application.properties | 12 ++++++------ zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java | 7 +++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java b/zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java index 5d429c1..c481134 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java +++ b/zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java @@ -22,6 +22,7 @@ import java.util.*; import java.util.Map.Entry; +import java.util.stream.Collectors; /** * DefaultAuthorityManager 实现了权限控制接口 @@ -163,11 +164,17 @@ // 普通员工账号只拥有自己所拥有的权限 List<SysFunction> userFunctionList = sysFunctionService.findFunctionByRoleIds(sysUser.getRoleIds()); for (SysFunction sysFunction : userFunctionList) { + + sysFunction.setSysFnBtnRel( + sysFunction.getSysFnBtnRel().stream().filter(item->StringUtils.isContentSet(item.getBtnValue(),sysFunction.getRpfBns())).collect(Collectors.toList()) + ); + // TODO注册访问路径 registerUrlMapping(userUrlMapping, sysFunction,false); if (userFunctionMap.containsKey(sysFunction.getFnCode())) { // 如果功能已经被添加到集合中则追加权限按钮 SysFunction oneFunctionInMap = userFunctionMap.get(sysFunction.getFnCode()); + // 为了方便判断所以用字符串记录一下 if (StringUtils.isBlank(oneFunctionInMap.getRpfBns())) { oneFunctionInMap.setRpfBns(sysFunction.getRpfBns()); diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties index 496ce97..863a592 100644 --- a/zq-erp/src/main/resources/config/application.properties +++ b/zq-erp/src/main/resources/config/application.properties @@ -4,9 +4,9 @@ #线上测试环境 # -spring.datasource.username=ct_test -spring.datasource.password=123456 -spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test_meidu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 +#spring.datasource.username=ct_test +#spring.datasource.password=123456 +#spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test_meidu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 #spring.datasource.username=xc_shop #spring.datasource.password=xc_shop123!@# @@ -17,9 +17,9 @@ #spring.datasource.password=hive123!@# #spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 -#spring.datasource.username=meidu_data -#spring.datasource.password=meidu_4321#&@ -#spring.datasource.url=jdbc:mysql://47.111.134.136/db_meidu_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 +spring.datasource.username=meidu_data +spring.datasource.password=meidu_4321#&@ +spring.datasource.url=jdbc:mysql://47.111.134.136/db_meidu_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource -- Gitblit v1.9.1