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

models/cygx/cygx_user_company.go

@@ -72,7 +72,7 @@ func GetCygxArticleHistoryRecordByCompany(condition string, startSize, pageSize
 		FROM
 			cygx_article_history_record_all AS r
 			INNER JOIN cygx_article AS art ON art.article_id = r.article_id
-			INNER JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
+			LEFT JOIN cygx_user_interaction_num AS ui ON ui.user_id = r.user_id
 			LEFT JOIN cygx_report_mapping AS re ON re.category_id = art.category_id_two
 			LEFT JOIN cygx_industrial_article_group_management AS man ON man.article_id = art.article_id
 		WHERE

services/cygx/admin_power.go

@@ -65,7 +65,7 @@ func GetAdminLookUserCompanyIds(sysUser *system.Admin) (companyIds []int, err er
 		for _, v := range companyProductList {
 			companyIds = append(companyIds, v.CompanyId)
 		}
-		companyIds = append(companyIds, 1) //添加潜在客户
+		companyIds = append(companyIds, 0) //添加潜在客户
 	}
 
 	return