debug:数据隔离
This commit is contained in:
parent
ad19cfa00d
commit
965c2a1359
|
@ -61,7 +61,9 @@ public class DataScopeUtil {
|
||||||
if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
|
if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
|
||||||
{
|
{
|
||||||
StringBuilder sqlString = getSqlString(currentUser, deptAlias, userAlias, PermissionContextHolder.getContext());
|
StringBuilder sqlString = getSqlString(currentUser, deptAlias, userAlias, PermissionContextHolder.getContext());
|
||||||
return getJoinSqlString(sqlString, "");
|
if (StringUtils.isNotBlank(sqlString.toString())) {
|
||||||
|
return getJoinSqlString(sqlString, null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@ spring:
|
||||||
druid:
|
druid:
|
||||||
# 主库数据源
|
# 主库数据源
|
||||||
master:
|
master:
|
||||||
url: jdbc:mysql://localhost:3306/yh-prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
url: jdbc:mysql://8.140.225.147:3306/yh-prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||||
username: root
|
username: root
|
||||||
password: e1069bd8d7daff94
|
password: e1069bd8d7daff94
|
||||||
# 从库数据源
|
# 从库数据源
|
||||||
|
|
|
@ -54,7 +54,7 @@ spring:
|
||||||
profiles:
|
profiles:
|
||||||
active:
|
active:
|
||||||
- dev
|
- dev
|
||||||
- druid
|
- druid-prod
|
||||||
# 文件上传
|
# 文件上传
|
||||||
servlet:
|
servlet:
|
||||||
multipart:
|
multipart:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user