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

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

@@ -443,6 +443,15 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
             designItemDetail.setGradientString(detail.getGradientString());
 
             designItemDetails.add(designItemDetail);
+
+            // 处理gradientString为null的情况，强制更新为null
+            if (Objects.isNull(detail.getGradientString()) && Objects.nonNull(designItemDetail.getId())) {
+                UpdateWrapper<DesignItemDetail> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.eq("id", designItemDetail.getId());
+                updateWrapper.set("gradient_string", null);
+                updateWrapper.set("update_date", DateUtil.getByTimeZone(timeZone));
+                designItemDetailService.update(null, updateWrapper);
+            }
         });
 
         // 逻辑删除未复用的旧记录

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 {