Merge branch 'dev/v4.8.59_dx' of qmx/jy into feature/v4.8.59

src/jfw/modules/bigmember/src/entity/portrait.go

@@ -64,7 +64,7 @@ func CreatePortraitManager(session *httpsession.Session, pageFlag string) (*Port
  * 3.免费用户（如免费用户、老版商机管理、老版超级订阅）通过一次留资可以解锁画像权限，查看画像的所有内容。
  */
 // CreatePortraitManagerForContacts 画像通讯里权限验证
-func CreatePortraitManagerForContacts(session *httpsession.Session, entType int64, entName string) (*Portrait, error) {
+func CreatePortraitManagerForContacts(session *httpsession.Session, entType int64, entName, thisUserId string) (*Portrait, error) {
 	userid := fmt.Sprint(qutil.Int64All(session.Get("base_user_id")))
 	if userid == "" || userid == "0" {
 		return nil, errors.New("未登录")
@@ -105,7 +105,7 @@ func CreatePortraitManagerForContacts(session *httpsession.Session, entType int6
 			}
 		}
 		if bigMsg.VipStatus <= 0 || bigMsg.Vip_BuySet.Upgrade != 1 { //免费用户留资体验
-			if jy.Portraitexperience(userid, entName, false) {
+			if jy.Portraitexperience(thisUserId, entName, false) {
 				return &Portrait{userid, session}, nil
 			}
 		}

src/jfw/modules/bigmember/src/service/portrait/memberPortraitAction.go

@@ -497,7 +497,7 @@ func (this *EntPortrait) PortraitContacts() {
 		entType, _ := this.GetInt("entType")
 		entName := this.GetString("entName")
 		// 画像通讯里访问权限
-		cepm, err := entity.CreatePortraitManagerForContacts(this.Session(), entType, entName)
+		cepm, err := entity.CreatePortraitManagerForContacts(this.Session(), entType, entName, userId)
 
 		if err != nil {
 			return nil, err