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

controllers/cygx/activity_meet.go

@@ -1484,7 +1484,8 @@ func (this *ActivityMeetCoAntroller) AttendanceDetail() {
 				isBloneSell = true
 			}
 			//如果这个活动属于销售创建，而且不是这个销售自己查看的，并且查看的角色不属于管理员或者权益管理员，那么就做限制处理
-			if isBloneSell && sysUser.AdminId != adminInfoActivity.AdminId && (sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_ADMIN) {
+			if isBloneSell && sysUser.AdminId != adminInfoActivity.AdminId && (sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_ADMIN) && !strings.Contains(activityInfo.AdminName, "6") {
+				//销售的6账号建的会，也可以让所有销售看到 需求池1020 2025-01-21
 				isProhibit = true //限制又取消了。2023-06-14 ，2024.09.04又开启了
 			}
 		}

controllers/cygx/summary_manage.go

@@ -240,6 +240,9 @@ func (this *SummaryManage) PreserveAndPublish() {
 		br.Msg = "请选择研选行业"
 		return
 	}
+	//买方研选自定义
+	item.ChartPermissionId = 31
+	item.ChartPermissionName = utils.CHART_PERMISSION_NAME_MAI_FANG_YANXUAN
 	charInfo, err := cygx.GetCategoryInfoByName(utils.CHART_PERMISSION_NAME_MF_YANXUAN)
 	if err != nil {
 		br.Msg = "操作失败"

controllers/statistic_company_merge.go

@@ -232,7 +232,8 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 		} else {
 			condition1, pars1 = getQueryParams(condition1, pars1, sysUser, "c.")
 		}
-		condition1 += ` AND a.create_time >= ? AND a.create_time <= ? AND a.operation in (` + operationSql + `)  	AND b.company_id  NOT IN  (	SELECT  company_id  FROM company_operation_record WHERE   product_id = 2 	AND  operation  ="loss"   GROUP BY company_id ) 	AND a.sys_user_id IN ( SELECT  admin_id FROM admin  WHERE  role_type_code IN ( 'rai_seller', 'rai_group' , 'rai_admin') ) `
+		//condition1 += ` AND a.create_time >= ? AND a.create_time <= ? AND a.operation in (` + operationSql + `)  	AND b.company_id  NOT IN  (	SELECT  company_id  FROM company_operation_record WHERE   product_id = 2 	AND  operation  ="loss"   GROUP BY company_id ) 	AND a.sys_user_id IN ( SELECT  admin_id FROM admin  WHERE  role_type_code IN ( 'rai_seller', 'rai_group' , 'rai_admin') ) `
+		condition1 += ` AND a.create_time >= ? AND a.create_time <= ? AND a.operation in (` + operationSql + `)  AND a.sys_user_id IN ( SELECT  admin_id FROM admin  WHERE  role_type_code IN ( 'rai_seller', 'rai_group' , 'rai_admin') ) `
 		pars1 = append(pars1, startDate, endDate)
 
 		total, err := models.GetIncrementalCompanyCountByOperationRecordRai(condition1, pars1)

models/cygx/summary_manage.go

@@ -93,6 +93,8 @@ type CygxArticle struct {
 	Annotation         string    `description:"核心观点"`
 	VisibleRange       int       `description:"设置可见范围1全部，0内部"`
 	//NickName           string    `description:"作者昵称"`
+	ChartPermissionId   int    `description:"行业id"`
+	ChartPermissionName string `description:"行业名称"`
 }
 
 type CygxArticleResp struct {