|
@@ -83,7 +83,7 @@ func GetSubScribeInfo(session *httpsession.Session, mg mongodb.MongodbSim, types
|
|
|
|
|
|
// 商机管理订阅设置
|
|
// 商机管理订阅设置
|
|
func EntnicheSub(entUserId, entId int64, types int64, mg mongodb.MongodbSim) *map[string]interface{} {
|
|
func EntnicheSub(entUserId, entId int64, types int64, mg mongodb.MongodbSim) *map[string]interface{} {
|
|
- object := &map[string]interface{}{}
|
|
|
|
|
|
+ //object := &map[string]interface{}{}
|
|
entnicheJy := &map[string]interface{}{}
|
|
entnicheJy := &map[string]interface{}{}
|
|
res, _ := mg.FindOne("entniche_rule", map[string]interface{}{
|
|
res, _ := mg.FindOne("entniche_rule", map[string]interface{}{
|
|
"i_userid": entUserId,
|
|
"i_userid": entUserId,
|
|
@@ -93,19 +93,19 @@ func EntnicheSub(entUserId, entId int64, types int64, mg mongodb.MongodbSim) *ma
|
|
if types == 2 {
|
|
if types == 2 {
|
|
if (*res)["o_entniche"] != nil {
|
|
if (*res)["o_entniche"] != nil {
|
|
ojy := common.ObjToMap((*res)["o_entniche"])
|
|
ojy := common.ObjToMap((*res)["o_entniche"])
|
|
- object = ojy
|
|
|
|
|
|
+ entnicheJy = ojy
|
|
if _, ok := (*ojy)["a_key"]; ok {
|
|
if _, ok := (*ojy)["a_key"]; ok {
|
|
akey := common.ObjArrToMapArr((*ojy)["a_key"].([]interface{}))
|
|
akey := common.ObjArrToMapArr((*ojy)["a_key"].([]interface{}))
|
|
- (*object)["a_items"] = []map[string]interface{}{ //转换至和其它结构一致
|
|
|
|
|
|
+ (*entnicheJy)["a_items"] = []map[string]interface{}{ //转换至和其它结构一致
|
|
map[string]interface{}{
|
|
map[string]interface{}{
|
|
"a_key": akey,
|
|
"a_key": akey,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if _, ok := (*ojy)["o_area"]; ok {
|
|
if _, ok := (*ojy)["o_area"]; ok {
|
|
- (*object)["o_area"] = map[string]interface{}{}
|
|
|
|
|
|
+ (*entnicheJy)["o_area"] = map[string]interface{}{}
|
|
} else {
|
|
} else {
|
|
- (*object)["o_area"] = (*ojy)["o_area"]
|
|
|
|
|
|
+ (*entnicheJy)["o_area"] = (*ojy)["o_area"]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|