Merge branch 'master' of http://8.136.199.33:3000/hongze/hz_crm_api into cygx/cygx_13.2

models/cygx/cygx_user.go

@@ -77,9 +77,9 @@ func GetCompanyListCount(userCondition, keyWord, kwywordcondition, condition, ro
 	}
 	if keyWord != "" {
 		if strings.Count(roleTypeCode, "admin") > 0 {
-			sql += `  OR  (   cp.product_id = 2  AND cp.status IN ('正式','试用','冻结')  AND  (  u.real_name LIKE '%` + keyWord + `%' OR u.mobile LIKE '%` + keyWord + `%' OR u.email  LIKE '%` + keyWord + `%' ) ` + userCondition + ` )`
+			sql += `  OR  (   cp.product_id = 2  AND cp.status IN ('正式','试用','冻结','永续')  AND  (  u.real_name LIKE '%` + keyWord + `%' OR u.mobile LIKE '%` + keyWord + `%' OR u.email  LIKE '%` + keyWord + `%' ) ` + userCondition + ` )`
 		} else {
-			sql += `  OR  (   cp.product_id = 2 AND   u.company_id IN (` + kwywordcondition + `)  AND cp.status IN ('正式','试用','冻结')  AND  (  u.real_name LIKE '%` + keyWord + `%' OR u.mobile LIKE '%` + keyWord + `%' OR u.email  LIKE '%` + keyWord + `%' ) ` + userCondition + ` )`
+			sql += `  OR  (   cp.product_id = 2 AND   u.company_id IN (` + kwywordcondition + `)  AND cp.status IN ('正式','试用','冻结','永续')  AND  (  u.real_name LIKE '%` + keyWord + `%' OR u.mobile LIKE '%` + keyWord + `%' OR u.email  LIKE '%` + keyWord + `%' ) ` + userCondition + ` )`
 		}
 	}
 
@@ -126,9 +126,9 @@ func GetCygxCompanyUserList(userCondition, keyWord, kwywordcondition, condition,
 	}
 	if keyWord != "" {
 		if strings.Count(roleTypeCode, "admin") > 0 {
-			sql += `  OR  (   cp.product_id = 2  AND cp.status IN ('正式','试用','冻结')  AND  (  u.real_name LIKE '%` + keyWord + `%' OR u.mobile LIKE '%` + keyWord + `%' OR u.email  LIKE '%` + keyWord + `%' ) ` + userCondition + `  )`
+			sql += `  OR  (   cp.product_id = 2  AND cp.status IN ('正式','试用','冻结','永续')  AND  (  u.real_name LIKE '%` + keyWord + `%' OR u.mobile LIKE '%` + keyWord + `%' OR u.email  LIKE '%` + keyWord + `%' ) ` + userCondition + `  )`
 		} else {
-			sql += `  OR  (   cp.product_id = 2 AND   u.company_id IN (` + kwywordcondition + `)  AND cp.status IN ('正式','试用','冻结')  AND  (  u.real_name LIKE '%` + keyWord + `%' OR u.mobile LIKE '%` + keyWord + `%' OR u.email  LIKE '%` + keyWord + `%' ) ` + userCondition + ` )`
+			sql += `  OR  (   cp.product_id = 2 AND   u.company_id IN (` + kwywordcondition + `)  AND cp.status IN ('正式','试用','冻结','永续')  AND  (  u.real_name LIKE '%` + keyWord + `%' OR u.mobile LIKE '%` + keyWord + `%' OR u.email  LIKE '%` + keyWord + `%' ) ` + userCondition + ` )`
 		}
 	}
 

services/cygx/contract_allocation.go

@@ -97,10 +97,10 @@ func GetCompanyContractPermissionNameMapById(companyContractIds []int) (mapContr
 	mapContractIdPerssion := make(map[int]string) //单个合同ID所对应的套餐或者权限名称
 	for _, v := range companyContractList {
 		if v.RaiPackageType == 1 {
-			mapContractIdPerssion[v.CompanyContractId] = "70w套餐"
+			mapContractIdPerssion[v.CompanyContractId] = "70w套餐,"
 		}
 		if v.RaiPackageType == 2 {
-			mapContractIdPerssion[v.CompanyContractId] = "45w套餐"
+			mapContractIdPerssion[v.CompanyContractId] = "45w套餐,"
 		}
 	}
 
@@ -133,6 +133,9 @@ func GetCompanyContractPermissionNameMapById(companyContractIds []int) (mapContr
 				}
 			}
 		} else {
+			if v.ChartPermissionId == utils.ZHUAN_JIA_ID {
+				mapContractIdPerssion[(v.CompanyContractId)] += utils.ZHUAN_JIA_NAME + ","
+			}
 			if v.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
 				if v.ExpensiveYx == 1 {
 					mapContractIdPerssion[(v.CompanyContractId)] += utils.CHART_PERMISSION_NAME_MF_YANXUAN + "(5w),"