aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/dev' into dev/dev

Browse Source
This commit is contained in:
xupei
2025-03-19 09:52:49 +08:00
parent 45f0d571d6 880adf7c69
commit 0a22f01587
1 changed files with 76 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
View File

@@ -314,7 +314,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
qw.lambda().eq(UserLikeGroup::getProjectId, projectId); qw.lambda().eq(UserLikeGroup::getProjectId, projectId);
List<UserLikeGroup> userLikeGroupList = userLikeGroupMapper.selectList(qw); List<UserLikeGroup> userLikeGroupList = userLikeGroupMapper.selectList(qw);
if (CollectionUtil.isEmpty(userLikeGroupList)) { if (CollectionUtil.isEmpty(userLikeGroupList)) {
throw new BusinessException("Lack of associated userLikeGroup."); return null;
} }
return userLikeGroupList.get(0); return userLikeGroupList.get(0);
} }
@@ -1267,6 +1267,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
} }
} }
Collection collection = collectionService.getById(collectionId); Collection collection = collectionService.getById(collectionId);
if (Objects.nonNull(collection)) {
if (null != collection.getMoodboardPosition()) { if (null != collection.getMoodboardPosition()) {
String moodboardPositionString = collectionService.getMoodboardPositionString(collection.getId()); String moodboardPositionString = collectionService.getMoodboardPositionString(collection.getId());
if (StringUtils.isEmpty(moodboardPositionString)) { if (StringUtils.isEmpty(moodboardPositionString)) {
@@ -1296,6 +1297,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
} }
moodBoardModuleChooseVO.setMoodBoards(list); moodBoardModuleChooseVO.setMoodBoards(list);
moduleChooseVO.setMoodBoard(moodBoardModuleChooseVO); moduleChooseVO.setMoodBoard(moodBoardModuleChooseVO);
}
}else if (module.equals(Module.printBoard.name())) { }else if (module.equals(Module.printBoard.name())) {
QueryWrapper<CollectionElement> qw = new QueryWrapper<>(); QueryWrapper<CollectionElement> qw = new QueryWrapper<>();
@@ -1349,6 +1351,9 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
}else if (module.equals(Module.design.name())) { }else if (module.equals(Module.design.name())) {
DesignModuleChooseVO vo = new DesignModuleChooseVO(); DesignModuleChooseVO vo = new DesignModuleChooseVO();
UserLikeGroup group = getByProjectId(projectDTO.getId()); UserLikeGroup group = getByProjectId(projectDTO.getId());
if (Objects.isNull(group)) {
moduleChooseVO.setDesign(vo);
}else {
Long userGroupId = group.getId(); Long userGroupId = group.getId();
// if (Objects.isNull(group)) { // if (Objects.isNull(group)) {
// throw new BusinessException("history.not.found"); // throw new BusinessException("history.not.found");
@@ -1399,6 +1404,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
vo.setUserGroupId(userGroupId); vo.setUserGroupId(userGroupId);
vo.setUserLikeDetails(userLikeVOS); vo.setUserLikeDetails(userLikeVOS);
moduleChooseVO.setDesign(vo); moduleChooseVO.setDesign(vo);
}
}else if (module.equals(Module.canvas.name())) { }else if (module.equals(Module.canvas.name())) {
CavasModuleChooseVO vo = new CavasModuleChooseVO(); CavasModuleChooseVO vo = new CavasModuleChooseVO();