Merge branch 'cygx/cygx_need_p2_876' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/activity.go

@@ -947,8 +947,8 @@ func (this *ActivityCoAntroller) ActivityList() {
 		condition += ` AND (art.label LIKE '%` + activityLabel + `%' )  `
 	}
 
-	//C类电话会，仅本组销售、部门管理员、admin、权益研究员账号能看到。
-	if sysUser.Role != "admin" {
+	//本组可见的活动对，非产品技术部 做权限限制
+	if sysUser.DepartmentId != 3 {
 		conditionPermission, err := cygxService.GetAdminActivityPermission(sysUser, condition)
 		if err != nil {
 			br.Msg = "获取失败"

controllers/cygx/activity_signup.go

@@ -124,8 +124,8 @@ func (this *ActivitySignupCoAntroller) SignupList() {
 	} else if publishStatus == 3 {
 		condition += ` AND art.publish_status = 0 AND  art.is_cancel = 1 `
 	}
-	//C类电话会，仅本组销售、部门管理员、admin、权益研究员账号能看到。
-	if sysUser.Role != "admin" {
+	//本组可见的活动对，非产品技术部 做权限限制
+	if sysUser.DepartmentId != 3 {
 		conditionPermission, err := cygxService.GetAdminActivityPermission(sysUser, condition)
 		if err != nil {
 			br.Msg = "获取失败"