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

controllers/cygx/contract_allocation.go

@@ -1131,7 +1131,11 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
 	for _, v := range permissionNameArr {
 		item := new(cygx.AllocationPermissionStatisticsListResp)
 		item.ChartPermissionName = v
-		item.List = mapPermissionUser[v]
+		if len(mapPermissionUser[v]) == 0 {
+			item.List = make([]*cygx.AllocationRealNameStatisticsListResp, 0)
+		} else {
+			item.List = mapPermissionUser[v]
+		}
 		list = append(list, item)
 	}
 

models/company/company_permission.go

@@ -379,7 +379,7 @@ func GetCompanyListCompanyIdByPermissionIdStr(permissionStr string) (company_id
 		SELECT 
 		GROUP_CONCAT(DISTINCT company_id) AS company_id
 		FROM company_report_permission
-		WHERE report_permission_id IN (?)
+		WHERE chart_permission_id IN (?)
 		#GROUP  BY company_id
 		`
 	err = o.Raw(sql, permissionStr).QueryRow(&company_id)
@@ -639,7 +639,7 @@ func GetCompanyIdsStrByReportPermissionIds(permissionIds []int) (companyIds []in
 			FROM
 				company_report_permission
 			WHERE
-				report_permission_id IN (` + utils.GetOrmInReplace(len(permissionIds)) + `) AND (DATE(NOW()) BETWEEN start_date AND end_date) AND status IN ('试用', '正式', '永续')`
+				chart_permission_id IN (` + utils.GetOrmInReplace(len(permissionIds)) + `) AND (DATE(NOW()) BETWEEN start_date AND end_date) AND status IN ('试用', '正式', '永续')`
 	_, err = o.Raw(sql, permissionIds).QueryRows(&companyIds)
 	return
 }