|
@@ -5,7 +5,6 @@ import (
|
|
|
"encoding/json"
|
|
"encoding/json"
|
|
|
"errors"
|
|
"errors"
|
|
|
"fmt"
|
|
"fmt"
|
|
|
- "log"
|
|
|
|
|
"sort"
|
|
"sort"
|
|
|
"strconv"
|
|
"strconv"
|
|
|
"strings"
|
|
"strings"
|
|
@@ -481,20 +480,16 @@ func (m *WorkDesktopMenu) ExcludeMenu(mv *JYMenu) (ep bool) {
|
|
|
}
|
|
}
|
|
|
level := cm.Level
|
|
level := cm.Level
|
|
|
for i := 0; i < level; i++ {
|
|
for i := 0; i < level; i++ {
|
|
|
- log.Println(cm.Name, "-------cm-----------:", cm.Exclude, "-------cm-----------:", cm.ParentId, "-------cm-----------:", cm.Id)
|
|
|
|
|
pBool := m.VerifyPermissions(cm.PowerIds, cm.Exclude)
|
|
pBool := m.VerifyPermissions(cm.PowerIds, cm.Exclude)
|
|
|
if pBool.ExcludeBool {
|
|
if pBool.ExcludeBool {
|
|
|
ep = true
|
|
ep = true
|
|
|
- log.Println("-------004-----------:")
|
|
|
|
|
continue
|
|
continue
|
|
|
}
|
|
}
|
|
|
wmn := BaseMysql.SelectBySql(`SELECT * FROM base_service.work_menu_new wmn WHERE wmn.id = ?`, cm.ParentId)
|
|
wmn := BaseMysql.SelectBySql(`SELECT * FROM base_service.work_menu_new wmn WHERE wmn.id = ?`, cm.ParentId)
|
|
|
if wmn == nil || len(*wmn) == 0 {
|
|
if wmn == nil || len(*wmn) == 0 {
|
|
|
- log.Println("-------003-----------:")
|
|
|
|
|
break
|
|
break
|
|
|
}
|
|
}
|
|
|
if cm.ParentId == 0 {
|
|
if cm.ParentId == 0 {
|
|
|
- log.Println("-------002-----------:")
|
|
|
|
|
break
|
|
break
|
|
|
}
|
|
}
|
|
|
cm = &JYMenu{
|
|
cm = &JYMenu{
|
|
@@ -506,7 +501,6 @@ func (m *WorkDesktopMenu) ExcludeMenu(mv *JYMenu) (ep bool) {
|
|
|
Level: MC.IntAll((*wmn)[0]["level"]),
|
|
Level: MC.IntAll((*wmn)[0]["level"]),
|
|
|
Exclude: MC.InterfaceToStr((*wmn)[0]["exclude"]),
|
|
Exclude: MC.InterfaceToStr((*wmn)[0]["exclude"]),
|
|
|
}
|
|
}
|
|
|
- log.Println("-------001-----------:")
|
|
|
|
|
}
|
|
}
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
