|
|
@@ -485,14 +485,14 @@ func MergeDatas(history, tmp map[string]interface{}, isTagRule, isDepartRmvRep b
|
|
|
history["tagid"] = tagIdResult
|
|
|
}
|
|
|
}
|
|
|
- if isDepartRmvRep { //全局模式 部门合并
|
|
|
- departname1 := qu.ObjToString(history["departname"])
|
|
|
- departname2 := qu.ObjToString(tmp["departname"])
|
|
|
- history["departname"] = MergeField(departname1, departname2)
|
|
|
- departid1 := qu.ObjToString(history["departid"])
|
|
|
- departid2 := qu.ObjToString(tmp["departid"])
|
|
|
- history["departid"] = MergeField(departid1, departid2)
|
|
|
- }
|
|
|
+ //if isDepartRmvRep { //全局模式 部门合并
|
|
|
+ departname1 := qu.ObjToString(history["departname"])
|
|
|
+ departname2 := qu.ObjToString(tmp["departname"])
|
|
|
+ history["departname"] = MergeField(departname1, departname2)
|
|
|
+ departid1 := qu.ObjToString(history["departid"])
|
|
|
+ departid2 := qu.ObjToString(tmp["departid"])
|
|
|
+ history["departid"] = MergeField(departid1, departid2)
|
|
|
+ //}
|
|
|
}
|
|
|
|
|
|
//合并字段
|
