diff --git a/internal/app/repository/permission.go b/internal/app/repository/permission.go index b080220..3b135f0 100644 --- a/internal/app/repository/permission.go +++ b/internal/app/repository/permission.go @@ -16,9 +16,24 @@ var PermissionRepository = new(permissionRepository) func (p *permissionRepository) GetPermssionList(account string) []model.PermissionPo { result := []model.PermissionPo{} - if err := db.Raw(`SELECT p.name ,p.uuid as pid,p2.owned ,p2."start" ,p2.stop ,p2.terminal,p2.log ,p2.write - FROM users u full join process p left join permission p2 on p2.account == u.account and p2.pid =p.uuid - WHERE u.account = ? or u.account ISNULL`, account).Find(&result); err.Error != nil { + if err := db.Raw(`SELECT + p.name , + p.uuid as pid, + p2.owned , + p2."start" , + p2.stop , + p2.terminal, + p2.log , + p2.write +FROM + users u +full join process p +left join permission p2 on + p2.account == u.account + and p2.pid = p.uuid +WHERE + u.account = ? + or u.account ISNULL`, account).Find(&result); err.Error != nil { log.Logger.Warnw("权限查询失败", "err", err) } diff --git a/internal/app/repository/task.go b/internal/app/repository/task.go index a96b42f..9a2a670 100644 --- a/internal/app/repository/task.go +++ b/internal/app/repository/task.go @@ -56,8 +56,19 @@ func (t *taskRepository) EditTaskEnable(id int, enable bool) (err error) { } func (t *taskRepository) GetAllTaskWithProcessName() (result []model.TaskVo) { - db.Raw(`SELECT t.*, p.name AS process_name, p2.name AS target_name,p3.name AS trigger_name - FROM task t LEFT JOIN process p ON t.process_id = p.uuid LEFT JOIN process p2 ON t.operation_target = p2.uuid LEFT JOIN process p3 ON t.trigger_target = p3.uuid`).Scan(&result) + db.Raw(`SELECT + t.*, + p.name AS process_name, + p2.name AS target_name, + p3.name AS trigger_name +FROM + task t +LEFT JOIN process p ON + t.process_id = p.uuid +LEFT JOIN process p2 ON + t.operation_target = p2.uuid +LEFT JOIN process p3 ON + t.trigger_target = p3.uuid`).Scan(&result) return }