|
@@ -60,8 +60,8 @@ func Distributor(region []string, entId, entUserId int) []*User {
|
|
|
if rules != nil && len(*rules) > 0 {
|
|
if rules != nil && len(*rules) > 0 {
|
|
|
if len(*rules) > 1 { //多条规则 查询优先级最高的规则
|
|
if len(*rules) > 1 { //多条规则 查询优先级最高的规则
|
|
|
//获取部门优先级
|
|
//获取部门优先级
|
|
|
- var ids = []int{entInfo.Dept.Id}
|
|
|
|
|
- departSort(&ids, entInfo.Dept.Id)
|
|
|
|
|
|
|
+ var ids = []int{v.Dept_id}
|
|
|
|
|
+ departSort(&ids, v.Dept_id)
|
|
|
Reverse(ids)
|
|
Reverse(ids)
|
|
|
for _, v1 := range ids {
|
|
for _, v1 := range ids {
|
|
|
for _, v2 := range *rules {
|
|
for _, v2 := range *rules {
|
