Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
d9cd58a8
Unverified
提交
d9cd58a8
authored
11月 26, 2021
作者:
王嘉豪
提交者:
GitHub
11月 26, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1293 from dataease/pr@dev@fix_panel-edit
refactor: 优化数据集查询树
上级
44fd7104
298b2cbe
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
83 行增加
和
6 行删除
+83
-6
VAuthModel.java
...end/src/main/java/io/dataease/base/domain/VAuthModel.java
+3
-0
VAuthModelExample.java
.../main/java/io/dataease/base/domain/VAuthModelExample.java
+60
-0
VAuthModelMapper.xml
...rc/main/java/io/dataease/base/mapper/VAuthModelMapper.xml
+19
-6
ExtVAuthModelMapper.xml
.../java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml
+1
-0
没有找到文件。
backend/src/main/java/io/dataease/base/domain/VAuthModel.java
浏览文件 @
d9cd58a8
...
...
@@ -21,5 +21,7 @@ public class VAuthModel implements Serializable {
private
Long
level
;
private
Long
mode
;
private
static
final
long
serialVersionUID
=
1L
;
}
\ No newline at end of file
backend/src/main/java/io/dataease/base/domain/VAuthModelExample.java
浏览文件 @
d9cd58a8
...
...
@@ -653,6 +653,66 @@ public class VAuthModelExample {
addCriterion
(
"`level` not between"
,
value1
,
value2
,
"level"
);
return
(
Criteria
)
this
;
}
public
Criteria
andModeIsNull
()
{
addCriterion
(
"`mode` is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andModeIsNotNull
()
{
addCriterion
(
"`mode` is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andModeEqualTo
(
Long
value
)
{
addCriterion
(
"`mode` ="
,
value
,
"mode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andModeNotEqualTo
(
Long
value
)
{
addCriterion
(
"`mode` <>"
,
value
,
"mode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andModeGreaterThan
(
Long
value
)
{
addCriterion
(
"`mode` >"
,
value
,
"mode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andModeGreaterThanOrEqualTo
(
Long
value
)
{
addCriterion
(
"`mode` >="
,
value
,
"mode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andModeLessThan
(
Long
value
)
{
addCriterion
(
"`mode` <"
,
value
,
"mode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andModeLessThanOrEqualTo
(
Long
value
)
{
addCriterion
(
"`mode` <="
,
value
,
"mode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andModeIn
(
List
<
Long
>
values
)
{
addCriterion
(
"`mode` in"
,
values
,
"mode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andModeNotIn
(
List
<
Long
>
values
)
{
addCriterion
(
"`mode` not in"
,
values
,
"mode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andModeBetween
(
Long
value1
,
Long
value2
)
{
addCriterion
(
"`mode` between"
,
value1
,
value2
,
"mode"
);
return
(
Criteria
)
this
;
}
public
Criteria
andModeNotBetween
(
Long
value1
,
Long
value2
)
{
addCriterion
(
"`mode` not between"
,
value1
,
value2
,
"mode"
);
return
(
Criteria
)
this
;
}
}
public
static
class
Criteria
extends
GeneratedCriteria
{
...
...
backend/src/main/java/io/dataease/base/mapper/VAuthModelMapper.xml
浏览文件 @
d9cd58a8
...
...
@@ -10,6 +10,7 @@
<result
column=
"auth_type"
jdbcType=
"VARCHAR"
property=
"authType"
/>
<result
column=
"create_by"
jdbcType=
"VARCHAR"
property=
"createBy"
/>
<result
column=
"level"
jdbcType=
"BIGINT"
property=
"level"
/>
<result
column=
"mode"
jdbcType=
"BIGINT"
property=
"mode"
/>
</resultMap>
<resultMap
extends=
"BaseResultMap"
id=
"ResultMapWithBLOBs"
type=
"io.dataease.base.domain.VAuthModelWithBLOBs"
>
<result
column=
"name"
jdbcType=
"LONGVARCHAR"
property=
"name"
/>
...
...
@@ -74,7 +75,8 @@
</where>
</sql>
<sql
id=
"Base_Column_List"
>
id, pid, node_type, model_type, model_inner_type, auth_type, create_by, `level`
id, pid, node_type, model_type, model_inner_type, auth_type, create_by, `level`,
`mode`
</sql>
<sql
id=
"Blob_Column_List"
>
`name`, `label`
...
...
@@ -118,12 +120,12 @@
<insert
id=
"insert"
parameterType=
"io.dataease.base.domain.VAuthModelWithBLOBs"
>
insert into v_auth_model (id, pid, node_type,
model_type, model_inner_type, auth_type,
create_by, `level`, `
nam
e`,
`label`)
create_by, `level`, `
mod
e`,
`
name`, `
label`)
values (#{id,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR}, #{nodeType,jdbcType=VARCHAR},
#{modelType,jdbcType=VARCHAR}, #{modelInnerType,jdbcType=VARCHAR}, #{authType,jdbcType=VARCHAR},
#{createBy,jdbcType=VARCHAR}, #{level,jdbcType=BIGINT}, #{
name,jdbcType=LONGVARCHAR
},
#{label,jdbcType=LONGVARCHAR})
#{createBy,jdbcType=VARCHAR}, #{level,jdbcType=BIGINT}, #{
mode,jdbcType=BIGINT
},
#{
name,jdbcType=LONGVARCHAR}, #{
label,jdbcType=LONGVARCHAR})
</insert>
<insert
id=
"insertSelective"
parameterType=
"io.dataease.base.domain.VAuthModelWithBLOBs"
>
insert into v_auth_model
...
...
@@ -152,6 +154,9 @@
<if
test=
"level != null"
>
`level`,
</if>
<if
test=
"mode != null"
>
`mode`,
</if>
<if
test=
"name != null"
>
`name`,
</if>
...
...
@@ -184,6 +189,9 @@
<if
test=
"level != null"
>
#{level,jdbcType=BIGINT},
</if>
<if
test=
"mode != null"
>
#{mode,jdbcType=BIGINT},
</if>
<if
test=
"name != null"
>
#{name,jdbcType=LONGVARCHAR},
</if>
...
...
@@ -225,6 +233,9 @@
<if
test=
"record.level != null"
>
`level` = #{record.level,jdbcType=BIGINT},
</if>
<if
test=
"record.mode != null"
>
`mode` = #{record.mode,jdbcType=BIGINT},
</if>
<if
test=
"record.name != null"
>
`name` = #{record.name,jdbcType=LONGVARCHAR},
</if>
...
...
@@ -246,6 +257,7 @@
auth_type = #{record.authType,jdbcType=VARCHAR},
create_by = #{record.createBy,jdbcType=VARCHAR},
`level` = #{record.level,jdbcType=BIGINT},
`mode` = #{record.mode,jdbcType=BIGINT},
`name` = #{record.name,jdbcType=LONGVARCHAR},
`label` = #{record.label,jdbcType=LONGVARCHAR}
<if
test=
"_parameter != null"
>
...
...
@@ -261,7 +273,8 @@
model_inner_type = #{record.modelInnerType,jdbcType=VARCHAR},
auth_type = #{record.authType,jdbcType=VARCHAR},
create_by = #{record.createBy,jdbcType=VARCHAR},
`level` = #{record.level,jdbcType=BIGINT}
`level` = #{record.level,jdbcType=BIGINT},
`mode` = #{record.mode,jdbcType=BIGINT}
<if
test=
"_parameter != null"
>
<include
refid=
"Update_By_Example_Where_Clause"
/>
</if>
...
...
backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml
浏览文件 @
d9cd58a8
...
...
@@ -18,6 +18,7 @@
v_auth_model.auth_type,
v_auth_model.create_by,
v_auth_model.level,
v_auth_model.mode,
authInfo.PRIVILEGES AS `privileges`
FROM
( SELECT GET_V_AUTH_MODEL_ID_P_USE ( #{request.userId}, #{request.modelType} ) cids ) t,
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论