Merge branch 'hjc_sweet_video' into pre

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

@@ -56,8 +56,8 @@ public class SweetArtistsController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "艺人姓名", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "pinyin", value = "姓名拼音", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "describes", value = "艺人简介", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String[]", name = "picArray", value = "图片数组", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String[]", name = "videoArray", value = "视频数组", required = true)
+            @ApiImplicitParam(type = "query", dataType = "String[]", name = "picArray", value = "图片数组", required = false),
+            @ApiImplicitParam(type = "query", dataType = "String[]", name = "videoArray", value = "视频数组", required = false)
     })
     public ResponseDto<Boolean> add(SweetArtistsListParam sweetArtistsList) {
         return sweetArtistsService.add(sweetArtistsList);
@@ -80,8 +80,8 @@ public class SweetArtistsController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "艺人姓名", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "pinyin", value = "姓名拼音", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "describes", value = "艺人简介", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String[]", name = "picArray", value = "图片数组", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String[]", name = "videoArray", value = "视频数组", required = true)
+            @ApiImplicitParam(type = "query", dataType = "String[]", name = "picArray", value = "图片数组", required = false),
+            @ApiImplicitParam(type = "query", dataType = "String[]", name = "videoArray", value = "视频数组", required = false)
     })
     public ResponseDto<Boolean> change(@RequestParam() String artistsId, SweetArtistsListParam sweetArtistsList) {
         return sweetArtistsService.change(artistsId, sweetArtistsList);

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetArtistsServiceImpl.java

@@ -88,15 +88,19 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe
             sweetArtistsMapper.insert(sweetArtists);
             sweetArtistsUrl.setArtistsId(mid);
             sweetArtistsUrl.setCreatedAt(time);
-            for (String img : sweetArtistsList.getPicArray()) {
-                sweetArtistsUrl.setUrl(img);
-                sweetArtistsUrl.setType("1");
-                sweetArtistsUrlMapper.insert(sweetArtistsUrl);
+            if (sweetArtistsList.getPicArray() != null) {
+                for (String img : sweetArtistsList.getPicArray()) {
+                    sweetArtistsUrl.setUrl(img);
+                    sweetArtistsUrl.setType("1");
+                    sweetArtistsUrlMapper.insert(sweetArtistsUrl);
+                }
             }
-            for (String video : sweetArtistsList.getVideoArray()) {
-                sweetArtistsUrl.setUrl(video);
-                sweetArtistsUrl.setType("2");
-                sweetArtistsUrlMapper.insert(sweetArtistsUrl);
+            if (sweetArtistsList.getVideoArray() != null) {
+                for (String video : sweetArtistsList.getVideoArray()) {
+                    sweetArtistsUrl.setUrl(video);
+                    sweetArtistsUrl.setType("2");
+                    sweetArtistsUrlMapper.insert(sweetArtistsUrl);
+                }
             }
             return ResponseDto.success();
         } catch (Exception e) {