fix

controllers/company.go

@@ -9192,6 +9192,7 @@ func (this *CompanyTodoController) CompanyActivitySpecialPointsBill() {
 		br.Msg = "请选择客户"
 		return
 	}
+
 	// 获取流水信息
 	var condition string
 	var pars []interface{}

services/cygx/activity_special.go

@@ -512,9 +512,10 @@ func GetChartPermissionSpecialSurplusByCompany(companyId int) (userType int, tri
 			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)
@@ -618,9 +619,10 @@ func ActivitySpecialCompanyApproval(companyId int, companyName string) (err erro
 		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)
@@ -629,14 +631,19 @@ func ActivitySpecialCompanyApproval(companyId int, companyName string) (err erro
 		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
-		}
-		if len(chartList) == 0 {
-			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 {
+		//	return
+		//}
 		for _, v := range chartList {
 			mapChartName[v.PermissionName] = 5 + mapPermissionNameTrip[v.ChartPermissionName]
 		}