Merge branch 'master' of http://8.136.199.33:3000/hongze/hz_crm_api into crm/crm_14.4.1

controllers/statistic_report.go

@@ -5755,7 +5755,7 @@ func (this *StatisticReportController) InvoicePaymentList() {
 		}
 		cond += ` AND (c.seller_id IN (` + strings.Join(sellerIdsList, ",") + `) OR d.seller_id IN (` + strings.Join(sellerIdsList, ",") + `))`
 	} else if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN {
-		cond += ` AND (c.seller_id=? OR d.seller_id=? )`
+		cond += ` AND (c.seller_id=? OR d.seller_id=?)`
 		pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 	}
 

models/cygx/cygx_user_company.go

@@ -186,6 +186,9 @@ func GetActivityMeetByCompanyWeekly(condition string, startSize, pageSize int) (
 			r.meeting_type_str,
 			r.meeting_authentication,
 			r.meeting_status_str,
+			r.company_name,
+			r.company_id,
+			r.real_name,
 			r.duration
 		FROM
 			cygx_activity_signup_detail AS r
@@ -288,7 +291,9 @@ func GetCygxArticleCollectByCompanyWeekly(startSize, pageSize int, condition str
 			r.create_time,
 			r.mobile,
 			r.real_name,
-			re.match_type_name,
+			re.match_type_name,	
+			r.company_name,
+			r.company_id,
 			(
 			SELECT
 				GROUP_CONCAT( DISTINCT s.subject_name SEPARATOR '/' ) 
@@ -371,6 +376,8 @@ func GetCygxIndustryFllowByCompanyWeekly(condition string, startSize, pageSize i
 			m.industry_name,
 			r.mobile,
 			r.real_name,
+			r.company_name,
+			r.company_id,
 			r.modify_time as create_time,
 			( SELECT GROUP_CONCAT( DISTINCT s.subject_name SEPARATOR '/' ) FROM cygx_industrial_subject AS s WHERE s.industrial_management_id = m.industrial_management_id ) AS subject_name_str 
 		FROM
@@ -448,6 +455,8 @@ func GetCygArticleDepartmentFollowByCompanyWeekly(condition string, startSize, p
 			m.department_id,
 			a.title,
 			a.article_id,
+			r.company_name,
+			r.company_id,
 			( SELECT MAX( create_time ) FROM cygx_article_department_follow WHERE user_id = r.user_id ) AS max_time
 		FROM
 			cygx_article_department_follow AS r
@@ -511,6 +520,8 @@ func GetCygxSearchKeyWordByCompanyWeekly(condition string, startSize, pageSize i
 			r.key_word,
 			r.create_time,
 			r.mobile,
+			r.company_name,
+			r.company_id,
 			r.real_name
 		FROM
 			cygx_search_key_word as r
@@ -596,9 +607,12 @@ func CygxActivitySpecialTripByCompanyWeekly(condition string, startSize, pageSiz
 			r.mobile,
 			r.activity_id,
 			r.real_name,
+			r.company_name,
+			r.seller_name,
+			r.company_id,
 			r.is_meeting 
 		FROM
-			cygx_activity_special_meeting_detail AS r
+			cygx_activity_special_trip AS r
 			INNER JOIN cygx_activity_special AS a ON a.activity_id = r.activity_id
 			INNER JOIN %s.user_seller_relation AS us ON us.user_id = r.user_id   AND us.product_id = 2 
 			WHERE 1= 1   AND a.publish_status = 1  `
@@ -723,6 +737,8 @@ func GetCygxRoadshowByCompanyWeekly(condition string, startSize, pageSize int) (
 			r.create_time,
 			r.real_name,
 			r.mobile,
+			r.company_name,
+			r.company_id,
 			"逻辑解析" AS file_type 
 		FROM
 			cygx_micro_roadshow_video_history AS r
@@ -735,6 +751,8 @@ func GetCygxRoadshowByCompanyWeekly(condition string, startSize, pageSize int) (
 			r.create_time,
 			r.real_name,
 			r.mobile,
+			r.company_name,
+			r.company_id,
 			"路演回放" AS file_type 
 		FROM
 			cygx_activity_video_history AS r
@@ -747,6 +765,8 @@ func GetCygxRoadshowByCompanyWeekly(condition string, startSize, pageSize int) (
 			r.create_time,
 			r.real_name,
 			r.mobile,
+			r.company_name,
+			r.company_id,
 			"路演回放" AS file_type 
 		FROM
 			cygx_activity_voice_history AS r

models/cygx/tag_history.go

@@ -219,7 +219,7 @@ func GetCygxTagHistoryListBycondition(condition string, startSize, pageSize int)
 // 获取列表
 func GetCygxTagHistoryListByconditionWeekly(condition string, startSize, pageSize int) (list []*UserInteraction, err error) {
 	databaseName := utils.GetWeeklyDatabase()
-	sql := ` SELECT r.real_name,r.mobile,r.company_name, r.create_time AS create_time,
+	sql := ` SELECT r.real_name,r.mobile,r.company_name, r.create_time AS create_time,	r.company_name,r.company_id,
 				b.tag_id,b.tag_name,b.article_types,b.activity_types,b.industries,b.subject_names
 				FROM cygx_tag_history as r 
 				INNER JOIN cygx_tag AS b ON r.tag_id = b.tag_id

services/cygx/resource_data.go

@@ -529,7 +529,10 @@ func UpdateProductInteriorResourceData(sourceId int) {
 		item.Source = source
 		item.SearchTag = mapMatchTypeName[detail.MatchTypeId]
 		item.PublishDate = publishDate
-		item.ChartPermissionId = detail.ChartPermissionId
+		if item.SearchTag != "观点周递" {
+			item.ChartPermissionId = detail.ChartPermissionId //首页筛选任何行业时，无法筛选出【观点周递】类型的报告
+		}
+
 		item.CreateTime = time.Now()
 		item.SearchTitle = detail.Title
 		item.SearchContent = detail.Abstract + industrialName + subjectName