TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2025-11-04 08:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 新增机器计划任务、数据物理删除调整为逻辑删除、支持记录登录ip归属地等

Browse Source
This commit is contained in:
meilin.huang
2023-07-20 22:41:13 +08:00
parent 6bd9e5333d
commit 7b51705f4e
81 changed files with 2162 additions and 629 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/internal/sys/infrastructure/persistence/resource.go
View File

@@ -35,7 +35,7 @@ func (r *resourceRepoImpl) GetByCondition(condition *entity.Resource, cols ...st
}
func (r *resourceRepoImpl) GetChildren(uiPath string) []entity.Resource {
sql := "SELECT id, ui_path FROM t_sys_resource WHERE ui_path LIKE ?"
sql := "SELECT id, ui_path FROM t_sys_resource WHERE ui_path LIKE ? AND is_deleted = 0"
var rs []entity.Resource
gormx.GetListBySql2Model(sql, &rs, uiPath+"%")
return rs
@@ -59,23 +59,23 @@ func (r *resourceRepoImpl) GetAccountResources(accountId uint64, toEntity any) {
FROM
t_sys_resource m
WHERE
m.status = 1
m.status = 1 AND m.is_deleted = 0
AND m.id IN (
SELECT DISTINCT
( rmb.resource_id )
FROM
t_sys_account_role p
JOIN t_sys_role r ON p.role_Id = r.id
AND p.account_id = ?
AND r.STATUS = 1
JOIN t_sys_role_resource rmb ON rmb.role_id = r.id UNION
AND p.account_id = ? AND p.is_deleted = 0
AND r.STATUS = 1 AND r.is_deleted = 0
JOIN t_sys_role_resource rmb ON rmb.role_id = r.id AND rmb.is_deleted = 0 UNION
SELECT
r.id
FROM
t_sys_resource r
JOIN t_sys_role_resource rr ON r.id = rr.resource_id
JOIN t_sys_role ro ON rr.role_id = ro.id
AND ro.status = 1 AND ro.code LIKE 'COMMON%'
AND ro.status = 1 AND ro.code LIKE 'COMMON%' AND ro.is_deleted = 0 AND rr.is_deleted = 0
)
ORDER BY
m.pid ASC,