Merge branch 'cygx_12.2.1' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -3871,7 +3871,7 @@ func (this *ActivityCoAntroller) OverActivityList() {
 		whichDay = ""
 	}
 	resp := new(models.GetCygxActivityLabelListRep)
-	if user.CompanyId <= 1 {
+	if user.CompanyId <= 1 && user.UserId > 0 {
 		resp.List = make([]*models.CygxActivityLabelList, 0)
 		br.Ret = 200
 		br.Success = true
@@ -3941,16 +3941,18 @@ func (this *ActivityCoAntroller) OverActivityList() {
 	sortTime = ` activity_time DESC `
 	//如果是永续的就按照普通的权限逻辑来查，如果不是就按照升级的逻辑来查
 
-	companyDetail, err := models.GetCompanyDetailByIdGroupTrip(user.CompanyId)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败，Err:" + err.Error()
-		return
-	}
-	if companyDetail.Status == "永续" {
-		conditionSpecial, err = services.HandleActivityLabelSpecialPermission(user)
-	} else {
-		conditionSpecial, _, err = services.HandleActivityLabelSpecialTripPermission(user)
+	if user.UserId > 0 { // v12.2.1
+		companyDetail, err := models.GetCompanyDetailByIdGroupTrip(user.CompanyId)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取失败，Err:" + err.Error()
+			return
+		}
+		if companyDetail.Status == "永续" {
+			conditionSpecial, err = services.HandleActivityLabelSpecialPermission(user)
+		} else {
+			conditionSpecial, _, err = services.HandleActivityLabelSpecialTripPermission(user)
+		}
 	}
 	if err != nil {
 		br.Msg = "获取失败"

controllers/article.go

@@ -438,6 +438,7 @@ Loop:
 	resp.HasPermission = hasPermission
 	resp.HaveResearch = haveResearch
 	if user.UserId == 0 {
+		resp.HasPermission = 1
 		if detail.UpdateFrequency == "daily" {
 			detail.Frequency = "日度"
 		} else if detail.UpdateFrequency == "weekly" {