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-ltx

Browse Source
This commit is contained in:
litianxiang
2026-01-26 11:16:46 +08:00
parent 49288c3a31 8f0d0953b2
commit 3e334d7956
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
View File

@@ -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);
}
});
// 逻辑删除未复用的旧记录

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());
userPreference.setDesignItemId(designItem.getId());
userPreference.setProjectId(projectId);
if (workspaceRelStyles == null) {
if (workspaceRelStyles == null||workspaceRelStyles.size()==0) {
//查不到记录，style应该是all
userPreference.setWorkspaceRelStyleId(0L);
} else {