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

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

Browse Source 
# Conflicts:
#	src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
This commit is contained in:
xupei
2026-01-26 14:49:38 +08:00
parent f5c3621a5d 8f0d0953b2
commit 891527426c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
View File

@@ -1154,7 +1154,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
.toLocalDateTime()); .toLocalDateTime());
userPreference.setDesignItemId(designItem.getId()); userPreference.setDesignItemId(designItem.getId());
userPreference.setProjectId(projectId); userPreference.setProjectId(projectId);
if (workspaceRelStyles == null || workspaceRelStyles.isEmpty()) { if (workspaceRelStyles == null||workspaceRelStyles.isEmpty()) {
//查不到记录，style应该是all //查不到记录，style应该是all
userPreference.setWorkspaceRelStyleId(0L); userPreference.setWorkspaceRelStyleId(0L);
} else { } else {