相册修改-v0.01

(cherry picked from commit de278eebb3793bad644cf4cc136eea95c6d739ba)

launch-admin/src/main/java/com/webflux/launchadmin/mysql/controller/planNew/PlanNewCommonOutController.java

@@ -859,7 +859,7 @@ public class PlanNewCommonOutController {
             });
             Mono<List<AlbumReq>> albumList = Mono.just(List.of());
             if (Objects.nonNull(request.getAlbumNum()) && 0 != request.getAlbumNum()) {
-                Mono<List<Long>> album_id = template.select(Query.query(Criteria.empty()).columns("album_id"), Album.class).flatMap(album -> Mono.just(album.albumId())).collectList();
+                Mono<List<Long>> album_id = template.select(Query.query(Criteria.where("group_id").is(plan.groupId())).columns("album_id"), Album.class).flatMap(album -> Mono.just(album.albumId())).collectList();
                 albumList = album_id.flatMap(lists -> {
                     if (lists.isEmpty() || lists.size() < request.getAlbumNum()) {
                         return Mono.error(new BaseException(StrUtil.format("相册素材数:{}；计划要求素材数：{} 不匹配", lists.size(), request.getAlbumNum())));

launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/sourceMaterial/materialManagement/MaterialManagementImpl.java

@@ -508,7 +508,7 @@ public class MaterialManagementImpl implements MaterialManagementInterface {
             albumReq.setGroupId(album.groupId());
             albumReq.setHeadUrl(album.headUrl());
             albumReq.setGroupId(album.groupId());
-            albumReq.setUserName(album.groupName());
+            albumReq.setUserName(album.userName());
             String s = album.imageListId();
             Mono<List<AlbumItemReq>> listMono = Mono.just(List.of());
             if (StringUtils.isNotEmpty(s)) {