Browse Source

no message

xingzai 1 year ago
parent
commit
a9cf96b992
2 changed files with 6 additions and 2 deletions
  1. 2 2
      models/statistic_report.go
  2. 4 0
      services/cygx/contract_allocation.go

+ 2 - 2
models/statistic_report.go

@@ -987,8 +987,8 @@ func GetCompanyContractPermissionNameGroupCount(condition string, pars []interfa
 			AND a.product_id = c.product_id
 			JOIN company_contract_permission d ON d.company_contract_id = a.company_contract_id 
 		WHERE
-			1 = 1 
-			AND d.permission_name IN ( '医药', '消费', '科技', '智造', '策略', '买方研选' ) `
+			1 = 1 `
+	//AND d.permission_name IN ( '医药', '消费', '科技', '智造', '策略','研选订阅','研选扣点包' ) `
 
 	if condition != "" {
 		sql += condition

+ 4 - 0
services/cygx/contract_allocation.go

@@ -145,6 +145,10 @@ func GetCompanyContractPermissionNameMapById(companyContractIds []int) (mapContr
 					mapContractIdPerssion[(v.CompanyContractId)] += utils.CHART_PERMISSION_NAME_MF_YANXUAN + ","
 				}
 			}
+
+			if v.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID {
+				mapContractIdPerssion[(v.CompanyContractId)] += utils.YAN_XUAN_KOU_DIAN_BAO_NAME + ","
+			}
 		}
 	}
 	//合并客观权限