fix

models/data_manage/company_user_type.go

@@ -55,7 +55,7 @@ func GetCygxCompanyUserTypeList() (items []*CygxCompanyUserType, err error) {
 // CygxCompanyUserType 更新权益客户身份类型
 func UpdateCygxCompanyUserTypeAndPackageType(companyId, useType, packageType int) (err error) {
 	o := orm.NewOrm()
-	sql := `UPDATE cygx_company_user_type SET customer_type_id=? AND package_type = ? WHERE company_id=? `
+	sql := `UPDATE cygx_company_user_type SET customer_type_id=?, package_type = ? WHERE company_id=? `
 	_, err = o.Raw(sql, useType, packageType, companyId).Exec()
 	return
 }

services/cygx/activity_points_set.go

@@ -77,6 +77,13 @@ func YanXuanCompanyCompanyTryOut(comapnyId int) (err error) {
 
 // 审批通过的时候专项调研次数更新
 func ActivitySpecialCompanyApproval(companyId int) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			msg := fmt.Sprint("companyId:", companyId)
+			go alarm_msg.SendAlarmMsg("审批通过试用转正式时专项调研次数更新失败："+err.Error()+msg, 2)
+		}
+	}()
 	comapny, e := models.GetCompanyById(companyId)
 	if e != nil {
 		err = errors.New("GetCompanyById err:" + e.Error())
@@ -123,9 +130,10 @@ func ActivitySpecialCompanyApproval(companyId int) (err error) {
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			err = errors.New("GetCompanyReportPermissionUpgrade, Err: " + e.Error())
 		}
-		if len(list) == 0 {
-			return
-		}
+		// 10.9.1本身升级没有也可能通过继承获得
+		//if len(list) == 0 {
+		//	return
+		//}
 		var chartPermissionIdSlice []string
 		mapChartName := make(map[string]int)
 		mapInheritChartName := make(map[string]int)
@@ -134,10 +142,13 @@ func ActivitySpecialCompanyApproval(companyId int) (err error) {
 		for _, v := range list {
 			chartPermissionIdSlice = append(chartPermissionIdSlice, strconv.Itoa(v.ChartPermissionId))
 		}
-		chartList, e := models.GetChartPermissionByIds(chartPermissionIdSlice)
-		if e != nil {
-			err = errors.New("获取品种信息失败, Err:" + e.Error())
-			return
+		chartList := make([]*models.ChartPermission, 0)
+		if len(chartPermissionIdSlice) > 0 {
+			chartList, e = models.GetChartPermissionByIds(chartPermissionIdSlice)
+			if e != nil {
+				err = errors.New("获取品种信息失败, Err:" + e.Error())
+				return
+			}
 		}
 		// 10.9.1本身升级套餐没有也可能通过继承获得
 		//if len(chartList) == 0 {