Merge branch 'pre' into 'master'

Pre

See merge request !257

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletController.java

@@ -175,10 +175,17 @@ public class SweetAppletController {
                             }
                         }
                     }
-
+                    if(item.getTitle().contains("&")){
+                        item.setTitle(item.getTitle().split("&")[0]);
+                    }
                     returnArtist.add(item);
                 }
             }
+            data.getStage().forEach(t->{
+                if(t.getTitle().contains("&")){
+                    t.setTitle(t.getTitle().split("&")[0]);
+                }
+            });
 
             data.setData(returnArtist);
             data.setTotal(allReturnArtist.size());
@@ -311,6 +318,9 @@ public class SweetAppletController {
                         }
                     }
                 }
+                if(item.getTitle().contains("&")){
+                    item.setTitle(item.getTitle().split("&")[0]);
+                }
                 vo = item;
                 break;
             }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletMdskController.java

@@ -166,11 +166,19 @@ public class SweetAppletMdskController {
                             }
                         }
                     }
-
+                    if(item.getTitle().contains("&")){
+                        item.setTitle(item.getTitle().split("&")[0]);
+                    }
                     returnArtist.add(item);
                 }
             }
 
+            data.getStage().forEach(t->{
+                if(t.getTitle().contains("&")){
+                    t.setTitle(t.getTitle().split("&")[0]);
+                }
+            });
+
             data.setData(returnArtist);
             data.setTotal(allReturnArtist.size());
             return ResponseDto.success(data);
@@ -285,6 +293,9 @@ public class SweetAppletMdskController {
                         }
                     }
                 }
+                if(item.getTitle().contains("&")){
+                    item.setTitle(item.getTitle().split("&")[0]);
+                }
                 vo = item;
                 break;
             }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletTFCController.java

@@ -163,11 +163,19 @@ public class SweetAppletTFCController {
                             }
                         }
                     }
-
+                    if(item.getTitle().contains("&")){
+                        item.setTitle(item.getTitle().split("&")[0]);
+                    }
                     returnArtist.add(item);
                 }
             }
 
+            data.getStage().forEach(t->{
+                if(t.getTitle().contains("&")){
+                    t.setTitle(t.getTitle().split("&")[0]);
+                }
+            });
+
             data.setData(returnArtist);
             data.setTotal(allReturnArtist.size());
             return ResponseDto.success(data);
@@ -282,6 +290,9 @@ public class SweetAppletTFCController {
                         }
                     }
                 }
+                if(item.getTitle().contains("&")){
+                    item.setTitle(item.getTitle().split("&")[0]);
+                }
                 vo = item;
                 break;
             }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisArDataUtils.java

@@ -71,10 +71,18 @@ public class RedisArDataUtils {
                         artist.setResourceUrl(urlList);
                     }
                     for (SweetManualArtistStageListArDto stage : stageList) {
-                        stage.setEnTitle("");
+                        if(stage.getTitle().contains("&")){
+                            stage.setEnTitle(stage.getTitle().split("&")[1]);
+                            stage.setTitle(stage.getTitle().split("&")[0]);
+                        } else {
+                            stage.setEnTitle("");
+                        }
                         List<SweetManualArtistListArDto> artistListArList = new ArrayList<>();
                         for (SweetManualArtistListArDto artist : artistList) {
                             if (artist.getPerformanceStart().contains(time) && stage.getStageId().equals(artist.getStageId())) {
+                                if(artist.getTitle().contains("&")){
+                                    artist.setTitle(artist.getTitle().split("&")[0]);
+                                }
                                 artistListArList.add(artist);
                             }
                         }