Forráskód Böngészése

Merge branch 'crm5.1' into debug

hsun 3 éve
szülő
commit
6dd99c1b22
1 módosított fájl, 15 hozzáadás és 13 törlés
  1. 15 13
      controllers/contract.go

+ 15 - 13
controllers/contract.go

@@ -440,19 +440,21 @@ func (c *ContractCommon) ListBySeal() {
 				contractIdSlice = append(contractIdSlice, strconv.Itoa(list[i].ContractId))
 			}
 		}
-		contractIdStr := strings.Join(contractIdSlice, ",")
-		contractList, err := contract_relation.GetContractRelationListByPaymentOnBehalfContractIds(contractIdStr)
-		if err != nil {
-			c.FailWithMessage("获取失败", "获取代付合同对应的合同数据失败,Err:"+err.Error())
-			return
-		}
-		userCompanyNameMap := make(map[int]string, 0)
-		for i := 0; i < len(contractList); i ++ {
-			userCompanyNameMap[contractList[i].PaymentOnBehalfContractId] = contractList[i].CompanyName
-		}
-		for _, item := range list {
-			if item.ContractBusinessType == "代付合同" {
-				item.UseCompanyName = userCompanyNameMap[item.ContractId]
+		if len(contractIdSlice) > 0 {
+			contractIdStr := strings.Join(contractIdSlice, ",")
+			contractList, err := contract_relation.GetContractRelationListByPaymentOnBehalfContractIds(contractIdStr)
+			if err != nil {
+				c.FailWithMessage("获取失败", "获取代付合同对应的合同数据失败,Err:"+err.Error())
+				return
+			}
+			userCompanyNameMap := make(map[int]string, 0)
+			for i := 0; i < len(contractList); i ++ {
+				userCompanyNameMap[contractList[i].PaymentOnBehalfContractId] = contractList[i].CompanyName
+			}
+			for _, item := range list {
+				if item.ContractBusinessType == "代付合同" {
+					item.UseCompanyName = userCompanyNameMap[item.ContractId]
+				}
 			}
 		}
 	}