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

fix: bug fxt

Browse Source
This commit is contained in:
wangjiahao 2021-05-19 15:13:05 +08:00
parent a5ebc48b99
commit d828901dac
6 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml
View File

@ -19,7 +19,7 @@
<where>
model_type = #{modelType}
<if test="createBy != null">
and ( v_auth_model.type ='spine' OR ( v_auth_model.create_by = #{createBy} AND v_auth_model.type = 'leaf'))
and FIND_IN_SET(v_auth_model.id,GET_V_AUTH_MODEL_WITH_PARENT ( (select GROUP_CONCAT(id) from v_auth_model where model_type = #{modelType} and create_by =#{createBy}) ,#{modelType}))
</if>
<if test="pid !=null">
and v_auth_model.pid = #{pid}
@ -54,7 +54,7 @@
<where>
model_type = #{modelType}
<if test="createBy != null">
and ( v_auth_model.type ='spine' OR ( v_auth_model.create_by = #{createBy} AND v_auth_model.type = 'leaf'))
and FIND_IN_SET(v_auth_model.id,GET_V_AUTH_MODEL_WITH_PARENT ( (select GROUP_CONCAT(id) from v_auth_model where model_type = #{modelType} and create_by =#{createBy}) ,#{modelType}))
</if>
</where>
) authTemp
@ -64,7 +64,7 @@
auth.id = authCount.pid
<where>
<if test="createBy != null">
(chartcount.children_count>0 or chart.create_by = #{createBy})
(authCount.children_count>0 or auth.create_by = #{createBy})
</if>
</where>

2
backend/src/main/java/io/dataease/datasource/service/DatasourceService.java
View File

@ -51,7 +51,7 @@ public class DatasourceService {
datasource.setId(UUID.randomUUID().toString());
datasource.setUpdateTime(currentTimeMillis);
datasource.setCreateTime(currentTimeMillis);
datasource.setCreateBy(String.valueOf(AuthUtils.getUser().getUserId()));
datasource.setCreateBy(String.valueOf(AuthUtils.getUser().getUsername()));
datasourceMapper.insertSelective(datasource);
return datasource;
}

3
backend/src/main/resources/db/migration/V2__dataease_ddl.sql
View File

@ -36,6 +36,7 @@ CREATE TABLE IF NOT EXISTS `user_role` (
)ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4;
DROP TABLE IF EXISTS `datasource`;
CREATE TABLE `datasource` (
`id` varchar(50) NOT NULL DEFAULT '' COMMENT 'ID',
`name` varchar(50) NOT NULL COMMENT '名称',
@ -467,4 +468,4 @@ CREATE TABLE `my_plugin` (
`bean_name` varchar(40) DEFAULT NULL COMMENT 'bean名称',
`icon` varchar(255) DEFAULT NULL COMMENT '图标',
PRIMARY KEY (`plugin_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

1
frontend/src/views/system/authority/authConfig.vue
View File

@ -118,6 +118,7 @@ export default {
},
created() {
this.targetActiveName = this.targetInfoArray[0].authType
this.sourceActiveName = this.sourceInfoArray[0].authType
},
methods: {

3
frontend/src/views/system/authority/components/LazyTree.vue
View File

@ -181,7 +181,7 @@ export default {
})
}
} else {
resolve([])
resolve(node.data.children)
}
},
filterNode(index) {
@ -197,7 +197,6 @@ export default {
// 高亮显示
this.highlights(res.data)
this.treeData = this.buildTree(res.data)
// 恢复searchStatus 状态 可以允许继续展开父级
this.$nextTick(() => (this.searchStatus = false))
})

8
frontend/src/views/system/authority/index.vue
View File

@ -5,10 +5,10 @@
<span slot="label">{{$t('auth.authConfig')}}</span>
<auth-config />
</el-tab-pane>
<el-tab-pane name="authQuickConfig">
<span slot="label">{{$t('auth.authQuickConfig')}}</span>
<auth-quick-config />
</el-tab-pane>
<!-- <el-tab-pane name="authQuickConfig">-->
<!-- <span slot="label">{{$t('auth.authQuickConfig')}}</span>-->
<!-- <auth-quick-config />-->
<!-- </el-tab-pane>-->
</el-tabs>
</de-main-container>
</template>