|
@@ -84,8 +84,7 @@ func (c *Customer) GetDepartments(stype string, departments []map[string]interfa
|
|
|
}
|
|
|
DM.GetSearchRules(c.ID, stype, c.IdRange, dsArr) //获取某个部门的所有规则
|
|
|
c.Departments = append(c.Departments, DM)
|
|
|
- qu.Debug("Departments---", DM.ID, DM.Name, DM.CustomerID, len(DM.Rules))
|
|
|
- log.Println(DM.Rules)
|
|
|
+ // qu.Debug("Departments---", DM.ID, DM.Name, DM.CustomerID, len(DM.Rules))
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -453,16 +452,13 @@ func (d *Department) GetSearchRules(cid, stype string, idRange bson.M, searchRul
|
|
|
o_rule, ok := sr["o_rules"].([]interface{})
|
|
|
if !ok {
|
|
|
o_rule = []interface{}{}
|
|
|
- log.Println("777")
|
|
|
}
|
|
|
o_rules := qu.ObjArrToMapArr(o_rule)
|
|
|
if len(o_rules) > 0 {
|
|
|
- log.Println("666")
|
|
|
SR.GetKeyAddWord(o_rules)
|
|
|
}
|
|
|
//获取全局清理词
|
|
|
SR.GetClearWord(clearKey, clearKeyMatch)
|
|
|
- log.Println("srsr", SR)
|
|
|
d.Rules = append(d.Rules, SR)
|
|
|
}
|
|
|
}
|