manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 重构主机分组页面.

Browse Source
This commit is contained in:
lijiahang
2023-11-23 19:16:57 +08:00
parent 2230d4ed8b
commit 5fe7ce07e5
16 changed files with 166 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DataPermissionServiceImpl.java
View File

@@ -78,12 +78,12 @@ public class DataPermissionServiceImpl implements DataPermissionService {
Long roleId = request.getRoleId();
String type = request.getType();
// 删除
LambdaQueryWrapper<DataPermissionDO> wrapper = dataPermissionDAO.wrapper()
.eq(DataPermissionDO::getUserId, userId)
.eq(DataPermissionDO::getRoleId, roleId)
.eq(DataPermissionDO::getType, type);
dataPermissionDAO.delete(wrapper);
if (Lists.isEmpty(request.getRelIdList())) {
LambdaQueryWrapper<DataPermissionDO> wrapper = dataPermissionDAO.wrapper()
.eq(DataPermissionDO::getUserId, userId)
.eq(DataPermissionDO::getRoleId, roleId)
.eq(DataPermissionDO::getType, type);
dataPermissionDAO.delete(wrapper);
return;
}
// 新增

4
orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml
View File

@@ -23,9 +23,9 @@
<select id="getRoleIdByUserIdAndRoleCode" resultType="java.lang.Long">
SELECT role_id
FROM system_user_role
WHERE user_id = 1
WHERE user_id = #{userId}
AND deleted = 0
AND role_id IN (SELECT id FROM system_role WHERE CODE = 'admin' AND deleted = 0) LIMIT 1
AND role_id IN (SELECT id FROM system_role WHERE CODE = #{code} AND deleted = 0) LIMIT 1
</select>
</mapper>