Merge branch 'dev' into test

@@ -69,7 +69,10 @@ func (l *MiniCompanySearchJoinedLogic) MiniCompanySearchJoined(req *types.Compan
 			return nil, xerr.NewErrMsgErr("公司列表获取失败", err)
 		}
 	} else if req.Flag == 2 {
-		total, companyList, err = l.svcCtx.CompanyRepository.Find(l.ctx, conn, queryOptions.MustWithKV("excludeIds", companyJoinedList))
+		if len(companyJoinedList) > 0 {
+			queryOptions.MustWithKV("excludeIds", companyJoinedList)
+		}
+		total, companyList, err = l.svcCtx.CompanyRepository.Find(l.ctx, conn, queryOptions)
 		if err != nil {
 			return nil, xerr.NewErrMsgErr("公司列表获取失败", err)
 		}