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

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

Browse Source
This commit is contained in:
litianxiang
2026-01-19 16:40:58 +08:00
parent 5bae785a9f c6aec917c2
commit bc92fcbaf4
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1140,12 +1140,12 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
userPreference.setPath(designItemDetail.getPath()); userPreference.setPath(designItemDetail.getPath());
SysFile sysFile = sysFileService.getOne(new LambdaQueryWrapper<SysFile>().eq(SysFile::getUrl, designItemDetail.getPath())); SysFile sysFile = sysFileService.getOne(new LambdaQueryWrapper<SysFile>().eq(SysFile::getUrl, designItemDetail.getPath()));
userPreference.setAccountId(userHolder.getId()); userPreference.setAccountId(userHolder.getId());
if (sysFile != null){ if (sysFile != null) {
userPreference.setCategory(sysFile.getLevel3Type().toLowerCase()+"_"+sysFile.getLevel2Type().toLowerCase()); userPreference.setCategory(sysFile.getLevel3Type().toLowerCase() + "_" + sysFile.getLevel2Type().toLowerCase());
userPreference.setStyle(sysFile.getStyle()); userPreference.setStyle(sysFile.getStyle());
}else { } else {
log.error("sysFile not found:{}",designItemDetail.getPath()); log.error("sysFile not found:{}", designItemDetail.getPath());
SendEmailUtil.commonExceptionReminder("url在sysFile里找不到"+designItemDetail.getPath(), new String[]{"litianxiangxtt@163.com"}); SendEmailUtil.commonExceptionReminder("url在sysFile里找不到" + designItemDetail.getPath(), new String[]{"litianxiangxtt@163.com"});
continue; continue;
} }
@@ -1154,6 +1154,10 @@ 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) {
//查不到记录，style应该是all
userPreference.setWorkspaceRelStyleId(0L);
}
userPreference.setWorkspaceRelStyleId(workspaceRelStyles.get(0).getStyleId()); userPreference.setWorkspaceRelStyleId(workspaceRelStyles.get(0).getStyleId());
userPreferenceMapper.insert(userPreference); userPreferenceMapper.insert(userPreference);
} }