Merge branch 'feature/v1.0.4' of https://jygit.jydev.jianyu360.cn/CRM/application into feature/v1.0.4

api/internal/service/plistService.go

@@ -59,7 +59,7 @@ type ProjectEntry struct {
 func GetProjectList(req *types.ProjectListReq) (resultList []*ProjectEntry, hasNextPage bool, total int) {
 	buyerM := BuyerList(req.PartyA, req.Supplier, req.Heterotophy, req.Intermediary, req.Agency, req.PositionId)
 	mmp := MonitorStatus(req.UserId) // 项目监控
-	buyerArr := make([]string, len(*buyerM))
+	var buyerArr []string
 	for b := range *buyerM {
 		buyerArr = append(buyerArr, b)
 	}
@@ -125,7 +125,11 @@ func getQuerySql(req *types.ProjectListReq, isPage bool, buyerArr []string) (cou
 	querys := []string{}
 	// 左侧选中的业主id
 	if len(buyerArr) > 0 {
-		querys = append(querys, fmt.Sprintf(" a.buyer_id in (%s) ", strings.Join(buyerArr, ",")))
+		var arr []string
+		for _, s := range buyerArr {
+			arr = append(arr, fmt.Sprintf("'%s'", s))
+		}
+		querys = append(querys, fmt.Sprintf(" a.buyer_id in (%s) ", strings.Join(arr, ",")))
 	}
 	//	商机类型
 	if req.BusinessType != "" && req.BusinessType != "全部" {
@@ -194,7 +198,7 @@ func getQuerySql(req *types.ProjectListReq, isPage bool, buyerArr []string) (cou
 	//物业业态
 	if req.PropertyForm != "" {
 		arr := []string{}
-		for _, v := range strings.Split(req.SubClass, ",") {
+		for _, v := range strings.Split(req.PropertyForm, ",") {
 			arr = append(arr, fmt.Sprintf("has(a.property_form, '%s')", v))
 		}
 		querys = append(querys, arr...)