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

src/main/java/com/ai/da/service/impl/DesignServiceImpl.java

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