Merge branch 'crm/crm_15.9.1' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company.go

@@ -1720,6 +1720,9 @@ func (this *CompanyController) List() {
 			//永续客户X类试用客户出参转换
 			v.StatusStr = strings.Replace(v.StatusStr, utils.COMPANY_STATUS_FOREVER, utils.COMPANY_STATUS_X_CLASS_TRY_OUT, -1)
 
+			if !utils.InArrayByStr([]string{"正式", "试用", "永续"}, v.Status) { //不是这几种状态不做标红处理
+				v.IsUserMaker = 0
+			}
 			//解决共享客户正式筛选下是否标红的问题
 			if v.WeekViewActive == 0 && v.IsUserMaker == 1 {
 				v.WeekViewActive = 1

services/cygx/contract_allocation.go

@@ -969,7 +969,7 @@ func GetCompanyProductIsUserMakerByCompanyIds(companyIds []int) (mapIsUserMakerR
 	var condition string
 	var pars []interface{}
 
-	condition += " AND  company_id IN (" + utils.GetOrmInReplace(lenArr) + ")  AND product_id = 2 AND is_user_maker = 1 "
+	condition += " AND  company_id IN (" + utils.GetOrmInReplace(lenArr) + ")  AND product_id = 2  AND status IN  ('正式','试用','永续') AND  company_id > 1  "
 	pars = append(pars, companyIds)
 
 	productList, e := company.GetCompanyProductList(condition, pars)