Merge branch 'dev_v1.1.40_wh' of BaseService/jyMicroservices into feature/v1.1.40

jyBXBase/api/internal/logic/checkSearchScreenLogic.go

@@ -33,11 +33,9 @@ func (l *CheckSearchScreenLogic) CheckSearchScreen(req *types.AddSearchScreen) (
 	if req.RegionMap != nil {
 		for k, v := range req.RegionMap {
 			areaMap := map[string]*bxbase.District{}
-			if v != nil {
-				for k1, v1 := range v {
-					areaMap[k1] = &bxbase.District{
-						District: v1,
-					}
+			for k1, v1 := range v {
+				areaMap[k1] = &bxbase.District{
+					District: v1,
 				}
 			}
 			region[k] = &bxbase.Area{

jyBXCore/rpc/model/es/search.go

@@ -238,6 +238,9 @@ func GetBidSearchQuery(in *bxcore.SearchReq) string {
 	}
 	district := in.District
 	if district != "" {
+		if len(query) > 0 {
+			query += ","
+		}
 		for k, v := range strings.Split(district, ",") {
 			if k > 0 {
 				query += `,`