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

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