Merge branch 'dev_v1.0.4_wh' of CRM/application into feature/v1.0.4

service/owner.go

@@ -59,6 +59,9 @@ func (t *OwnerService) OwnerlList() map[string]interface{} {
 	if t.PartyA != "" || t.Supplier != "" || t.Heterotophy != "" || t.Intermediary != "" || t.Agency != "" {
 		dataMap = BuyerList(t.PartyA, t.Supplier, t.Heterotophy, t.Intermediary, t.Agency)
 	}
+	if len(*dataMap) == 0 {
+		return map[string]interface{}{}
+	}
 	if t.SearchEntName != "" {
 		//es查询
 	}
@@ -71,7 +74,7 @@ func (t *OwnerService) OwnerlList() map[string]interface{} {
 	//项目数量查询
 	buyerArr := []string{}
 	for key := range *dataMap {
-		buyerArr = append(buyerArr, fmt.Sprintf(`"%s"`, gconv.String(key)))
+		buyerArr = append(buyerArr, fmt.Sprintf(`'%s'`, gconv.String(key)))
 	}
 	//项目数量处理
 	projectMap := ProjectHandle(buyerArr, t.Area)
@@ -440,7 +443,7 @@ func BuyerList(partyA, supplier, heterotophy, intermediary, agency string) *map[
 	dataMap := &map[string]map[string]interface{}{}
 	//甲方
 	if partyA != "" {
-		for _, v := range strings.Split(intermediary, ",") {
+		for _, v := range strings.Split(partyA, ",") {
 			intermediaryArr := strings.Split(v, "_")
 			if len(intermediaryArr) == 2 {
 				(*dataMap)[intermediaryArr[1]] = map[string]interface{}{
@@ -474,7 +477,11 @@ func BuyerList(partyA, supplier, heterotophy, intermediary, agency string) *map[
 	}
 	//招标代理
 	if agency != "" {
-		sqlStr := fmt.Sprintf(`SELECT buyer, buyer_id FROM transaction_info  where agency_id in (%s)   order by  userid`, agency)
+		agencyArr := []string{}
+		for _, s := range strings.Split(agency, ",") {
+			agencyArr = append(agencyArr, fmt.Sprintf("'%s'"), s)
+		}
+		sqlStr := fmt.Sprintf(`SELECT buyer, buyer_id FROM transaction_info  where agency_id in (%s)   order by  userid`, strings.Join(agencyArr, ","))
 		FindHandle(sqlStr, dataMap)
 	}
 	return dataMap