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

jyBXBase/rpc/internal/logic/checksearchlogic.go

@@ -82,7 +82,15 @@ func (l *CheckSearchLogic) CheckSearch(in *bxbase.AddSearchReq) (res *bxbase.Che
 	inMap := common.StructToMapMore(in)
 	areaArr := []string{}
 	for k, v := range in.RegionMap {
+		if v.Area == nil {
+			areaArr = append(areaArr, fmt.Sprintf("%s_%s_%s", k, "", ""))
+			continue
+		}
 		for k1, v1 := range v.Area {
+			if len(v1.District) == 0 {
+				areaArr = append(areaArr, fmt.Sprintf("%s_%s_%s", k, k1, ""))
+				continue
+			}
 			for _, v2 := range v1.District {
 				areaArr = append(areaArr, fmt.Sprintf("%s_%s_%s", k, k1, v2))
 			}