Merge branch 'dev/4.8.95_fu' of qmx/jy into feature/v4.8.95

src/jfw/modules/bigmember/src/service/use/use.go

@@ -777,7 +777,7 @@ func (u *Use) IsAdd() {
 			power = append(power, k)
 			//P303 业主监控  老版大会员权限调整2024.2.4 发版之前的大会员
 			if bigPower.Status > 0 {
-				if k == 7 && bigPower.StartTime < 1706976000 {
+				if k == 7 && bigPower.StartTime < 1707051600 {
 					power = append(power, 25) //业主监控专家版500
 					//switch bigPower.Status {
 					//case 6:

src/jfw/modules/publicapply/src/customer/entity/entiy.go

@@ -345,7 +345,7 @@ func getCustomerLimit(userInfo *powercheck.CheckResp) (count int, limitStatus in
 	// 大会员
 	if userInfo.Member.Status > 0 {
 		//P303 业主监控  老版大会员权限调整2024.2.4 发版之前的大会员
-		if userInfo.Member.StartTime < 1706457600 {
+		if userInfo.Member.StartTime < 1707051600 {
 			for i := 0; i < len(userInfo.Member.MemberPowerList); i++ {
 				if userInfo.Member.MemberPowerList[i] == 7 {
 					userInfo.Member.MemberPowerList = append(userInfo.Member.MemberPowerList, 25) //业主监控专家版500

src/jfw/modules/publicapply/src/customer/service/service.go

@@ -146,7 +146,7 @@ func (this *ServiceStruct) CstAtt() {
 }
 
 func (this *ServiceStruct) Read() {
-	userInfo := util.GetUserBaseInfo(this.Session())
+	sess := util.GetUserBaseInfo(this.Session())
 	defer qu.Catch()
 	r := func() Result {
 		if this.Method() != "POST" {
@@ -161,7 +161,8 @@ func (this *ServiceStruct) Read() {
 		if cotion.Name == "" {
 			return Result{Data: nil, Error_msg: Error_msg_1003}
 		}
-		cotion.UserId = userInfo.UserId
+        userInfo := jy.GetBigVipUserBaseMsg(this.Session(), *config.Middleground)
+        cotion.UserId = qu.If(userInfo.Pid != "", userInfo.Pid, sess.UserId).(string)
 		return Result{Data: cotion.Read()}
 	}()
 	this.ServeJson(r)