|
@@ -1,7 +1,6 @@
|
|
|
package entity
|
|
package entity
|
|
|
|
|
|
|
|
import (
|
|
import (
|
|
|
- "bp.jydev.jianyu360.cn/BaseService/powerCheckCenter/entity"
|
|
|
|
|
"database/sql"
|
|
"database/sql"
|
|
|
"encoding/json"
|
|
"encoding/json"
|
|
|
"errors"
|
|
"errors"
|
|
@@ -481,21 +480,18 @@ 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++ {
|
|
|
- if cm.ParentId == 0 {
|
|
|
|
|
- break
|
|
|
|
|
- }
|
|
|
|
|
- if cm.Exclude == "" {
|
|
|
|
|
- continue
|
|
|
|
|
- }
|
|
|
|
|
pBool := m.VerifyPermissions(cm.PowerIds, cm.Exclude)
|
|
pBool := m.VerifyPermissions(cm.PowerIds, cm.Exclude)
|
|
|
if pBool.ExcludeBool {
|
|
if pBool.ExcludeBool {
|
|
|
ep = true
|
|
ep = true
|
|
|
continue
|
|
continue
|
|
|
}
|
|
}
|
|
|
- wmn := entity.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 {
|
|
|
break
|
|
break
|
|
|
}
|
|
}
|
|
|
|
|
+ if cm.ParentId == 0 {
|
|
|
|
|
+ break
|
|
|
|
|
+ }
|
|
|
cm = &JYMenu{
|
|
cm = &JYMenu{
|
|
|
Id: MC.IntAll((*wmn)[0]["id"]),
|
|
Id: MC.IntAll((*wmn)[0]["id"]),
|
|
|
Name: MC.InterfaceToStr((*wmn)[0]["name"]),
|
|
Name: MC.InterfaceToStr((*wmn)[0]["name"]),
|
