|
|
@@ -5,6 +5,7 @@ import (
|
|
|
"eta/eta_api/controllers"
|
|
|
"eta/eta_api/models"
|
|
|
"eta/eta_api/models/data_manage"
|
|
|
+ "eta/eta_api/models/system"
|
|
|
"eta/eta_api/services/data"
|
|
|
"eta/eta_api/utils"
|
|
|
"fmt"
|
|
|
@@ -120,10 +121,25 @@ func (this *ChartFrameworkController) PublicMenu() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+ // 用户被删除不展示框架
|
|
|
+ admins, e := system.GetSysAdminList(``, make([]interface{}, 0), []string{}, "")
|
|
|
+ if e != nil {
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "获取系统用户列表失败, Err: " + e.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ adminExist := make(map[int]bool)
|
|
|
+ for _, v := range admins {
|
|
|
+ adminExist[v.AdminId] = true
|
|
|
+ }
|
|
|
+
|
|
|
userExist := make(map[int]bool)
|
|
|
userFrameworks := make(map[int][]*data_manage.ChartFrameworkItem)
|
|
|
resp := make([]*data_manage.ChartFrameworkPublicMenuItem, 0)
|
|
|
for _, v := range list {
|
|
|
+ if !adminExist[v.AdminId] {
|
|
|
+ continue
|
|
|
+ }
|
|
|
if !userExist[v.AdminId] {
|
|
|
u := new(data_manage.ChartFrameworkPublicMenuItem)
|
|
|
u.AdminId = v.AdminId
|
