|
|
@@ -621,12 +621,15 @@ func (r *ErmcpRoleMenu) GetDataEx() (interface{}, error) {
|
|
|
}
|
|
|
|
|
|
// 获取有权限的菜单
|
|
|
- rData := make([]ErmcpRoleMenu, 0)
|
|
|
- err := db.GetEngine().SQL(r.buildSql()).Find(&rData)
|
|
|
- // 判断权限
|
|
|
- for i := range sDataEx {
|
|
|
- s := &sDataEx[i]
|
|
|
- s.setRold(rData)
|
|
|
+ var err error
|
|
|
+ if len(r.FilterRoleId) > 0 {
|
|
|
+ rData := make([]ErmcpRoleMenu, 0)
|
|
|
+ err = db.GetEngine().SQL(r.buildSql()).Find(&rData)
|
|
|
+ // 判断权限
|
|
|
+ for i := range sDataEx {
|
|
|
+ s := &sDataEx[i]
|
|
|
+ s.setRold(rData)
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
return sDataEx, err
|