|
|
|
@ -1265,13 +1265,13 @@ func GetNewAccredit(systemName, roleId string, userKey, orgId, postId int64) (ro |
|
|
|
for _, rev := range roleEmpowerCont { |
|
|
|
menuList := strings.Split(rev.PointId, ",") |
|
|
|
for _, mv := range menuList { //菜单权限
|
|
|
|
if IsInTrue[string](mv, pointIdAry) == false { |
|
|
|
if mv != "" && IsInTrue[string](mv, pointIdAry) == false { |
|
|
|
pointIdAry = append(pointIdAry, mv) |
|
|
|
} |
|
|
|
} |
|
|
|
operList := strings.Split(rev.Operation, ",") |
|
|
|
for _, ov := range operList { //操作权限
|
|
|
|
if IsInTrue[string](ov, operationAry) == false { |
|
|
|
if ov != "" && IsInTrue[string](ov, operationAry) == false { |
|
|
|
operationAry = append(operationAry, ov) |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1293,7 +1293,7 @@ func GetNewAccredit(systemName, roleId string, userKey, orgId, postId int64) (ro |
|
|
|
} else { |
|
|
|
guoduPoin := strings.Split(orgEmpowerCont.PointId, ",") |
|
|
|
for _, pv := range guoduPoin { //合并权限
|
|
|
|
if IsInTrue[string](pv, pointIdAry) == false { |
|
|
|
if pv != "" && IsInTrue[string](pv, pointIdAry) == false { |
|
|
|
pointIdAry = append(pointIdAry, pv) |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1303,9 +1303,9 @@ func GetNewAccredit(systemName, roleId string, userKey, orgId, postId int64) (ro |
|
|
|
operationAry = strings.Split(orgEmpowerCont.Operation, ",") |
|
|
|
} else { |
|
|
|
guoduOper := strings.Split(orgEmpowerCont.Operation, ",") |
|
|
|
for _, pv := range guoduOper { //合并权限
|
|
|
|
if IsInTrue[string](pv, operationAry) == false { |
|
|
|
operationAry = append(operationAry, pv) |
|
|
|
for _, gpv := range guoduOper { //合并权限
|
|
|
|
if gpv != "" && IsInTrue[string](gpv, operationAry) == false { |
|
|
|
operationAry = append(operationAry, gpv) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|