feat:订阅相关

jyBXSubscribe/rpc/internal/logic/getsubsomeinfologic.go

@@ -33,7 +33,8 @@ func (l *GetSubSomeInfoLogic) GetSubSomeInfo(in *bxsubscribe.SomeInfoReq) (*bxsu
 	resp := &bxsubscribe.SomeInfoResp{
 		Data: &bxsubscribe.SomeInfo{},
 	}
-	user, _ := model.NewSubscribePush(in.UserType).UserInfo(in.UserId)
+	//P278 身份切换，切换企业 userId从代理header 获取的值是 职位id，所以改成用base_user_id 进行查user表信息
+	user, _ := model.NewSubscribePush(in.UserType).UserInfo(in.NewUserId)
 	//
 	resp.Data.HasKey, resp.Data.Industry = model.GetKeySet(in.UserType, user, []string{})
 	todayNum := time.Unix(time.Now().Unix(), 1).Format("20060102")

jyBXSubscribe/rpc/model/push.go

@@ -962,16 +962,16 @@ func (s *subscribePush) SetRead(newUserId, id int64, userId, entUserId, entId st
 	return nil
 }
 
-// 获取用户信息
-func (s *subscribePush) UserInfo(userId string) (*map[string]interface{}, int64) {
-	user, ok := IC.Mgo.FindById("user", userId, `{"s_m_openid":1,"a_m_openid":1,"s_phone":1,"a_mergeorder":1,"o_jy":1,"l_firstpushtime":1,"i_vip_status":1,"l_vip_endtime":1,"o_vipjy":1,"i_member_status":1,"o_member_jy":1}`)
+// UserInfo 获取用户信息
+func (s *subscribePush) UserInfo(baseUserId int64) (*map[string]interface{}, int64) {
+	user, ok := IC.Mgo.FindOneByField("user", map[string]interface{}{"base_user_id": baseUserId}, `{"s_m_openid":1,"a_m_openid":1,"s_phone":1,"a_mergeorder":1,"o_jy":1,"l_firstpushtime":1,"i_vip_status":1,"l_vip_endtime":1,"o_vipjy":1,"i_member_status":1,"o_member_jy":1}`)
 	if !ok || user == nil {
 		return nil, 0
 	}
 	return user, common.Int64All((*user)["l_firstpushtime"])
 }
 
-// 是否有订阅词
+// GetKeySet 是否有订阅词
 func GetKeySet(t string, u *map[string]interface{}, data []string) (bool, []string) {
 	var industry_ = []string{}
 	if u != nil {