Merge branch 'cygx_10.9'

controllers/activity.go

@@ -24,6 +24,10 @@ type ActivityABaseController struct {
 	BaseCommonController
 }
 
+type ActivityNoLoginController struct {
+	BaseAuthMobileController
+}
+
 // @Title 活动类型列表
 // @Description活动类型列表接口
 // @Success 200 {object} models.ActivityTypeListResp
@@ -1699,7 +1703,7 @@ func (this *ActivityCoAntroller) LabelMoreList() {
 // @Param   IsResearchPoints   query   string  false       "是否仅展示研选扣点 1：展示研选扣点、2：展示外部资源 ，1,2两者都展示" //兼容前端
 // @Success 200 {object} models.GetCygxActivityListRep
 // @router /listNew [get]
-func (this *ActivityCoAntroller) ActivityListNew() {
+func (this *ActivityNoLoginController) ActivityListNew() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -2195,7 +2199,7 @@ func (this *ActivityCoAntroller) CheckAsk() {
 // @Param   IsPower   query   int  false       "是否选择有权限行业 ，1是 0 否 默认0"
 // @Success 200 {object} models.ActivityTypeListHomeResp
 // @router /labelTypeListV5 [get]
-func (this *ActivityCoAntroller) LabelTypeListV5() {
+func (this *ActivityNoLoginController) LabelTypeListV5() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br

routers/commentsRouter.go

@@ -97,15 +97,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "LabelTypeListV5",
-            Router: `/labelTypeListV5`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
         beego.ControllerComments{
             Method: "LabelTypeListV6Pc",
@@ -115,15 +106,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
-        beego.ControllerComments{
-            Method: "ActivityListNew",
-            Router: `/listNew`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityCoAntroller"],
         beego.ControllerComments{
             Method: "ActivityListSearch",
@@ -241,6 +223,24 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityNoLoginController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityNoLoginController"],
+        beego.ControllerComments{
+            Method: "LabelTypeListV5",
+            Router: `/labelTypeListV5`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityNoLoginController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivityNoLoginController"],
+        beego.ControllerComments{
+            Method: "ActivityListNew",
+            Router: `/listNew`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivitySignCoAntroller"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ActivitySignCoAntroller"],
         beego.ControllerComments{
             Method: "ByHand",

routers/router.go

@@ -96,6 +96,7 @@ func init() {
 			web.NSInclude(
 				&controllers.ActivityCoAntroller{},
 				&controllers.ActivityABaseController{},
+				&controllers.ActivityNoLoginController{},
 			),
 		),
 		web.NSNamespace("/research",

services/activity.go

@@ -1150,8 +1150,8 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 // 根据用户身份处理活动可见
 func ActivityConditioninitSql(user *models.WxUserItem, condition string, isPower int) (conditionActivity string, err error) {
 	// cygx_10.9 未绑定联系方式的客户可以看到部分活动
-	if user.UserId == 0 {
-		conditionActivity = ` AND art.publish_status = 1  AND art.visible_range != 1  AND (art.is_limit_people = 0 OR (art.is_limit_people=1 AND art.is_all_customer_type=1))   ` + condition
+	if user.UserId == 0 || user.CompanyId == 1 {
+		conditionActivity  = ` AND art.publish_status = 1  AND art.visible_range != 1 AND (art.is_limit_people = 0 OR (art.is_limit_people=1 AND art.is_all_customer_type=1))   ` + condition
 		return
 	}
 	condition += `   AND art.publish_status = 1 `