Release 2.8.1
This commit is contained in:
@@ -236,7 +236,14 @@ async function syncUserRoles(pool, userId, roleIds) {
|
||||
|
||||
await pool.query('DELETE FROM a_user_roles WHERE user_id = ?', [userId]);
|
||||
for (const roleId of uniqueRoleIds) {
|
||||
await pool.query('INSERT IGNORE INTO a_user_roles (user_id, role_id, created_by, modified_by) VALUES (?, ?, ?, ?)', [userId, roleId, null, null]);
|
||||
await pool.query(
|
||||
`INSERT INTO a_user_roles (user_id, role_id, created_by, modified_by)
|
||||
SELECT ?, ?, ?, ?
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM a_user_roles WHERE user_id = ? AND role_id = ?
|
||||
)`,
|
||||
[userId, roleId, null, null, userId, roleId]
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -249,7 +256,14 @@ async function syncRoleUsers(pool, roleId, userIds) {
|
||||
|
||||
await pool.query('DELETE FROM a_user_roles WHERE role_id = ?', [roleId]);
|
||||
for (const userId of uniqueUserIds) {
|
||||
await pool.query('INSERT IGNORE INTO a_user_roles (user_id, role_id, created_by, modified_by) VALUES (?, ?, ?, ?)', [userId, roleId, null, null]);
|
||||
await pool.query(
|
||||
`INSERT INTO a_user_roles (user_id, role_id, created_by, modified_by)
|
||||
SELECT ?, ?, ?, ?
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM a_user_roles WHERE user_id = ? AND role_id = ?
|
||||
)`,
|
||||
[userId, roleId, null, null, userId, roleId]
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -268,7 +282,15 @@ async function syncRolePermissions(pool, roleId, permissionKeys) {
|
||||
|
||||
await pool.query('DELETE FROM a_role_permissions WHERE role_id = ?', [roleId]);
|
||||
for (const permissionRow of permissionRows) {
|
||||
await pool.query('INSERT IGNORE INTO a_role_permissions (role_id, permission_id, created_by, modified_by) VALUES (?, ?, ?, ?)', [roleId, Number(permissionRow.id), null, null]);
|
||||
const permissionId = Number(permissionRow.id);
|
||||
await pool.query(
|
||||
`INSERT INTO a_role_permissions (role_id, permission_id, created_by, modified_by)
|
||||
SELECT ?, ?, ?, ?
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM a_role_permissions WHERE role_id = ? AND permission_id = ?
|
||||
)`,
|
||||
[roleId, permissionId, null, null, roleId, permissionId]
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user