center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 顶级目录权限错误问题

Browse Source
This commit is contained in:
wangjiahao 2021-05-19 19:16:34 +08:00
parent 8b4753d9af
commit 50be91cc7e
7 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/base/mapper/ext/ExtChartGroupMapper.xml
View File

@ -13,9 +13,9 @@
select
id, `name`, pid, `level`, `type`, create_by, create_time,`name` as label,
get_auths(id,'chart',#{userId}) as `privileges`
from chart_group
from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'chart') cids) t,chart_group
<where>
FIND_IN_SET(chart_group.id,GET_V_AUTH_MODEL_ID_P_USE(#{userId},'chart'))
FIND_IN_SET(chart_group.id,cids)
<if test="id != null">
and chart_group.id = #{id,jdbcType=VARCHAR}
</if>

4
backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
View File

@ -14,9 +14,9 @@
id, `name`, scene_id, table_id, `type`, title, create_by, create_time, update_time,
style_priority,x_axis, y_axis, custom_attr, custom_style, custom_filter, snapshot,
get_auths(id,'chart',#{userId}) as `privileges`
from chart_view
from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'chart') cids) t,chart_view
<where>
FIND_IN_SET(chart_view.id,GET_V_AUTH_MODEL_ID_P_USE(#{userId},'chart'))
FIND_IN_SET(chart_view.id,cids)
<if test="sceneId != null">
and scene_id = #{sceneId,jdbcType=VARCHAR}
</if>

4
backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetGroupMapper.xml
View File

@ -13,9 +13,9 @@
select
id, `name`, pid, `level`, `type`, create_by, create_time,`name` as label,
get_auths(id,'dataset',#{userId}) as `privileges`
from dataset_group
from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'dataset') cids) t,dataset_group
<where>
FIND_IN_SET(dataset_group.id,GET_V_AUTH_MODEL_ID_P_USE(#{userId},'dataset'))
FIND_IN_SET(dataset_group.id,cids)
<if test="id != null">
and dataset_group.id = #{id,jdbcType=VARCHAR}
</if>

4
backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml
View File

@ -12,9 +12,9 @@
select
id, `name`, scene_id, data_source_id, `type`, `mode`,`info`, create_by, create_time,
get_auths(id,'dataset',#{userId}) as `privileges`
from dataset_table
from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'dataset') cids) t,dataset_table
<where>
FIND_IN_SET(dataset_table.id,GET_V_AUTH_MODEL_ID_P_USE(#{userId},'dataset'))
FIND_IN_SET(dataset_table.id,cids)
<if test="sceneId != null">
and scene_id = #{sceneId,jdbcType=VARCHAR}
</if>

8
backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSourceMapper.xml
View File

@ -10,11 +10,11 @@
<select id="query" parameterType="io.dataease.base.mapper.ext.query.GridExample" resultMap="BaseResultMapDTO">
select id , name , `desc` ,`type` , configuration ,create_time ,update_time,
get_auths(id,'link',#{extendCondition}) as `privileges`
from datasource
from (select GET_V_AUTH_MODEL_ID_P_USE (#{extendCondition}, 'link') cids) t,datasource
<if test="_parameter != null">
<include refid="io.dataease.base.mapper.ext.query.GridSql.gridCondition" />
</if>
and FIND_IN_SET(datasource.id,GET_V_AUTH_MODEL_ID_P_USE(#{extendCondition},'link'))
and FIND_IN_SET(datasource.id,cids)
<if test="orderByClause != null">
order by ${orderByClause}
</if>
@ -25,9 +25,9 @@
<select id="queryUnion" resultMap="BaseResultMapDTO">
select id , name , `desc` ,`type` , configuration ,create_time ,update_time
from datasource
from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'link') cids) t,datasource
<where>
FIND_IN_SET(datasource.id,GET_V_AUTH_MODEL_ID_P_USE(#{userId},'link'))
FIND_IN_SET(datasource.id,cids))
<if test="id != null">
id = #{id,jdbcType=VARCHAR}
</if>

4
backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml
View File

@ -24,7 +24,7 @@
panel_type,
`name` AS label,
authInfo.`privileges`
from panel_group
from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'panel') cids) t,panel_group
left join
(SELECT
`sys_auth`.`auth_source` AS `auth_source`,
@ -56,7 +56,7 @@
`sys_auth`.`auth_source_type`) authInfo
on panel_group.id = authInfo.auth_source and authInfo.auth_source_type='panel'
<where>
FIND_IN_SET(panel_group.id,GET_V_AUTH_MODEL_ID_P_USE(#{userId},'panel'))
FIND_IN_SET(panel_group.id,cids)
<if test="name != null">
and panel_group.name like CONCAT('%', #{name},'%')
</if>

3
frontend/src/lang/en.js
View File

@ -87,6 +87,7 @@ export default {
password_error: 'The password can not be less than 6 digits'
},
commons: {
close: 'Close',
icon: 'Icon',
all: 'All',
enable: 'Enable',
@ -872,7 +873,7 @@ export default {
clean_canvas: 'Clean Canvas',
insert_picture: 'Insert Picture',
redo: 'Redo',
undo: 'UToolbar.vuendo',
undo: 'Undo',
panel_null: 'This is a Empty Panel，You Can Edit and Enrich It'
},
plugin: {