Merge branch 'dev/2.9.38_fu' of jianyu/ent_new into feature/v2.9.38

entniche_new/src/service/customer/customer.go

@@ -1269,7 +1269,7 @@ func (this *CustomerAction) CstList() {
 				res[key].WProvince = dataMap[value.Name].WProvince
 			}
 		}
-		var cInfoArr []*CustomerInfo
+		cInfoArr := []*CustomerInfo{}
 		if len(res) > 0 {
 			if (pageNo+1)*pageSize >= len(res) {
 				cInfoArr = res[pageNo*pageSize:]

entniche_new/src/service/customer/entiy.go

@@ -118,10 +118,11 @@ func (this *CustomerOperation) CList(searchCode string, isCliam int64, entUserId
 	//count = MQFW.Count(fc, query)
 	customerList := Mysql.SelectBySql("SELECT ec.name,euu.customer_id FROM entniche_user_customer euu LEFT JOIN entniche_customer ec ON ec.id = euu.customer_id  WHERE user_id = ? AND (source_type =1 or source_type =4) ", entUserId)
 	customerMap := map[string]interface{}{}
-	for _, value := range *customerList {
-		customerMap[qutil.ObjToString(value["name"])] = value["customer_id"]
+	if customerList != nil && len(*customerList) > 0 {
+		for _, value := range *customerList {
+			customerMap[qutil.ObjToString(value["name"])] = value["customer_id"]
+		}
 	}
-
 	clist, ok := MQFW.Find(fc, query, `{"date":-1}`, `{"name":1,"date":1}`, false, 0, countLimit)
 	if ok && clist != nil && len(*clist) > 0 {
 		count = len(*clist)