github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 12:03:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: 修改拼写错误，格式化代码

Browse Source
This commit is contained in:
fit2cloud-chenyw 2022-10-24 14:42:37 +08:00
parent 3fdeef0312
commit c01d44f280
4 changed files with 135 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/dataease/controller/sys/SysUserController.java
View File

@ -248,16 +248,16 @@ public class SysUserController {
AuthBindDTO dto = new AuthBindDTO();
if (ObjectUtils.isEmpty(sysUserAssist)) return dto;
if (authUserService.supportWecom() && StringUtils.isNotBlank(sysUserAssist.getWecomId())) {
dto.setWecomBinded(true);
dto.setWecomBound(true);
}
if (authUserService.supportDingtalk() && StringUtils.isNotBlank(sysUserAssist.getDingtalkId())) {
dto.setDingtalkBinded(true);
dto.setDingtalkBound(true);
}
if (authUserService.supportLark() && StringUtils.isNotBlank(sysUserAssist.getLarkId())) {
dto.setLarkBinded(true);
dto.setLarkBound(true);
}
if (authUserService.supportLarksuite() && StringUtils.isNotBlank(sysUserAssist.getLarksuiteId())) {
dto.setLarksuiteBinded(true);
dto.setLarksuiteBound(true);
}
return dto;
}

8
backend/src/main/java/io/dataease/controller/sys/response/AuthBindDTO.java
View File

@ -7,11 +7,11 @@ import java.io.Serializable;
@Data
public class AuthBindDTO implements Serializable {
private Boolean wecomBinded = false;
private Boolean wecomBound = false;
private Boolean dingtalkBinded = false;
private Boolean dingtalkBound = false;
private Boolean larkBinded = false;
private Boolean larkBound = false;
private Boolean larksuiteBinded = false;
private Boolean larksuiteBound = false;
}

151
backend/src/main/java/io/dataease/ext/AuthMapper.xml
View File

@ -23,8 +23,7 @@
<select id="findUser" resultMap="baseMap">
select
sys_user.user_id,
select sys_user.user_id,
sys_user.username,
sys_user.nick_name,
sys_user.dept_id,
@ -37,113 +36,171 @@
sys_user.`from`,
sys_dept.name as dept_name
from sys_user
left join sys_dept on sys_user.dept_id=sys_dept.dept_id
left join sys_dept on sys_user.dept_id = sys_dept.dept_id
where user_id = #{userId}
</select>
<select id="findUserByName" resultMap="baseMap">
select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` from sys_user where username = #{username}
select user_id,
username,
nick_name,
dept_id,
password,
enabled,
email,
phone, language, is_admin, `from`
from sys_user
where username = #{username}
</select>
<select id="findLdapUserByName" resultMap="baseMap">
select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` from sys_user a where username = #{username} and a.from = 1
select user_id,
username,
nick_name,
dept_id,
password,
enabled,
email,
phone, language, is_admin, `from`
from sys_user a
where username = #{username} and a.from = 1
</select>
<select id="findCasUserByName" resultMap="baseMap">
select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` from sys_user a where username = #{username} and a.from = 3
select user_id,
username,
nick_name,
dept_id,
password,
enabled,
email,
phone, language, is_admin, `from`
from sys_user a
where username = #{username} and a.from = 3
</select>
<select id="findUserBySub" resultMap="baseMap">
select user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from` from sys_user where sub = #{sub} and `from` = #{userFrom}
select user_id,
username,
nick_name,
dept_id,
password,
enabled,
email,
phone, language, is_admin, `from`
from sys_user
where sub = #{sub}
and `from` = #{userFrom}
</select>
<select id="roleCodes" resultType="String">
select r.role_id from sys_role r
left join sys_users_roles sur on sur.role_id = r.role_id
where sur.user_id = #{userId}
select r.role_id
from sys_role r
left join sys_users_roles sur on sur.role_id = r.role_id
where sur.user_id = #{userId}
</select>
<select id="permissions" resultType="String">
SELECT
sys_menu.permission
FROM
( SELECT GET_V_AUTH_MODEL_ID_P_USE ( #{userId}, 'menu' ) cids ) t,
sys_menu
WHERE
FIND_IN_SET( sys_menu.menu_id, cids ) UNION ALL
SELECT
plugin_sys_menu.permission
FROM
( SELECT GET_V_AUTH_MODEL_ID_P_USE ( #{userId}, 'menu' ) cids ) t,
plugin_sys_menu
WHERE
FIND_IN_SET( plugin_sys_menu.menu_id, cids )
SELECT sys_menu.permission
FROM (SELECT GET_V_AUTH_MODEL_ID_P_USE(#{userId}, 'menu') cids) t,
sys_menu
WHERE FIND_IN_SET(sys_menu.menu_id, cids)
UNION ALL
SELECT plugin_sys_menu.permission
FROM (SELECT GET_V_AUTH_MODEL_ID_P_USE(#{userId}, 'menu') cids) t,
plugin_sys_menu
WHERE FIND_IN_SET(plugin_sys_menu.menu_id, cids)
</select>
<select id="userMenuIds" resultType="Long">
select srm.menu_id
from sys_roles_menus srm
left join sys_users_roles sur on sur.role_id = srm.role_id
left join sys_users_roles sur on sur.role_id = srm.role_id
where sur.user_id = #{userId}
</select>
<select id="roles" resultMap="roleMap">
select r.role_id, r.name
from sys_role r
left join sys_users_roles sur on sur.role_id = r.role_id
left join sys_users_roles sur on sur.role_id = r.role_id
where sur.user_id = #{userId}
</select>
<select id="permissionsAll" resultType="String">
SELECT
sys_menu.permission
FROM
sys_menu UNION ALL
SELECT
plugin_sys_menu.permission
FROM
plugin_sys_menu
SELECT sys_menu.permission
FROM sys_menu
UNION ALL
SELECT plugin_sys_menu.permission
FROM plugin_sys_menu
</select>
<select id="findWecomUser" resultMap="baseMap">
select
u.user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from`
select u.user_id,
username,
nick_name,
dept_id,
password,
enabled,
email,
phone, language, is_admin, `from`
from
sys_user_assist a
left join
sys_user u on u.user_id = a.user_id
left join
sys_user u
on u.user_id = a.user_id
where a.wecom_id = #{wecomId}
</select>
<select id="findDingtalkUser" resultMap="baseMap">
select
u.user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from`
select u.user_id,
username,
nick_name,
dept_id,
password,
enabled,
email,
phone, language, is_admin, `from`
from
sys_user_assist a
left join
sys_user u on u.user_id = a.user_id
sys_user u
on u.user_id = a.user_id
where a.dingtalk_id = #{dingtalkId}
</select>
<select id="findLarkUser" resultMap="baseMap">
select
u.user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from`
select u.user_id,
username,
nick_name,
dept_id,
password,
enabled,
email,
phone, language, is_admin, `from`
from
sys_user_assist a
left join
sys_user u on u.user_id = a.user_id
sys_user u
on u.user_id = a.user_id
where a.lark_id = #{larkId}
</select>
<select id="findLarksuiteUser" resultMap="baseMap">
select
u.user_id, username,nick_name, dept_id, password, enabled,email, phone, language ,is_admin, `from`
select u.user_id,
username,
nick_name,
dept_id,
password,
enabled,
email,
phone, language, is_admin, `from`
from
sys_user_assist a
left join
sys_user u on u.user_id = a.user_id
sys_user u
on u.user_id = a.user_id
where a.larksuite_id = #{larksuiteId}
</select>

32
backend/src/main/resources/db/migration/V42__1.16.sql
View File

@ -1,19 +1,33 @@
UPDATE `sys_menu` set `component` = REPLACE(`component`, 'SysParam', 'sysParam') where (`component` like '%SysParam%');
UPDATE `sys_menu`
set `component` = REPLACE(`component`, 'SysParam', 'sysParam')
where (`component` like '%SysParam%');
UPDATE `sys_menu` set `component` = REPLACE(`component`, 'privateForm', 'PrivateForm') where (`component` like '%privateForm%');
UPDATE `sys_menu`
set `component` = REPLACE(`component`, 'privateForm', 'PrivateForm')
where (`component` like '%privateForm%');
UPDATE `sys_menu` set `component` = REPLACE(`component`, 'personPwd', 'PersonPwd') where (`component` like '%personPwd%');
UPDATE `sys_menu`
set `component` = REPLACE(`component`, 'personPwd', 'PersonPwd')
where (`component` like '%personPwd%');
UPDATE `sys_menu` set `component` = REPLACE(`component`, 'dataset', 'Dataset') where (`component` = 'system/task/dataset');
UPDATE `sys_menu`
set `component` = REPLACE(`component`, 'dataset', 'Dataset')
where (`component` = 'system/task/dataset');
UPDATE `sys_menu` set `component` = REPLACE(`component`, 'form', 'Form') where (`component` = 'system/task/form');
UPDATE `sys_menu`
set `component` = REPLACE(`component`, 'form', 'Form')
where (`component` = 'system/task/form');
ALTER TABLE `dataset_table_field` ADD COLUMN `date_format` VARCHAR(255) NULL AFTER `accuracy`;
ALTER TABLE `dataset_table_field`
ADD COLUMN `date_format` VARCHAR(255) NULL AFTER `accuracy`;
ALTER TABLE `sys_task_email` ADD COLUMN `view_data_range` VARCHAR(255) NULL DEFAULT 'view' AFTER `reci_users`;
ALTER TABLE `sys_task_email`
ADD COLUMN `view_data_range` VARCHAR(255) NULL DEFAULT 'view' AFTER `reci_users`;
UPDATE `sys_msg_type` set `type_name` = 'i18n_msg_type_dataset_sync_failed' WHERE (`msg_type_id` = 6);
UPDATE `sys_msg_type`
set `type_name` = 'i18n_msg_type_dataset_sync_failed'
WHERE (`msg_type_id` = 6);
ALTER TABLE `sys_user_assist`
ADD COLUMN `larksuite_id` VARCHAR(255) NULL DEFAULT NULL AFTER `lark_id`;
ADD COLUMN `larksuite_id` VARCHAR(255) NULL DEFAULT NULL AFTER `lark_id`;