diff --git a/src/main/java/com/ai/da/service/SysFileService.java b/src/main/java/com/ai/da/service/SysFileService.java index 0b35bb04..a2a04ad5 100644 --- a/src/main/java/com/ai/da/service/SysFileService.java +++ b/src/main/java/com/ai/da/service/SysFileService.java @@ -61,5 +61,5 @@ public interface SysFileService extends IService { List getByIds(List ids); - SysFile getOneBySex(Long styleId, String sex); + SysFile getOneBySex(Long styleId, String sex, String ageGroup); } diff --git a/src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java b/src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java index 08d6f412..978e93c1 100644 --- a/src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java @@ -7,9 +7,11 @@ import com.ai.da.common.enums.SysFileLevel1TypeEnum; import com.ai.da.common.enums.SysFileLevel2TypeEnum; import com.ai.da.common.utils.*; import com.ai.da.mapper.primary.StyleMapper; +import com.ai.da.mapper.primary.SysFileExtraMapper; import com.ai.da.mapper.primary.SysFileMapper; import com.ai.da.mapper.primary.entity.Style; import com.ai.da.mapper.primary.entity.SysFile; +import com.ai.da.mapper.primary.entity.SysFileExtra; import com.ai.da.model.vo.SysFileVO; import com.ai.da.service.SysFileService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -44,6 +46,8 @@ public class SysFileServiceImpl extends ServiceImpl impl @Resource private SysFileMapper sysFileMapper; @Resource + private SysFileExtraMapper sysFileExtraMapper; + @Resource private FileProperties fileProperties; @Resource private StyleMapper styleMapper; @@ -273,7 +277,7 @@ public class SysFileServiceImpl extends ServiceImpl impl } @Override - public SysFile getOneBySex(Long styleId, String sex) { + public SysFile getOneBySex(Long styleId, String sex, String ageGroup) { Style style = new Style(); if (styleId != null) { style = styleMapper.selectById(styleId); @@ -281,6 +285,14 @@ public class SysFileServiceImpl extends ServiceImpl impl QueryWrapper qw = new QueryWrapper<>(); qw.lambda().eq(SysFile::getLevel1Type, "Models"); qw.lambda().eq(SysFile::getLevel2Type, sex); + + QueryWrapper sysFileExtraQW = new QueryWrapper<>(); + sysFileExtraQW.lambda().eq(SysFileExtra::getAgeGroup, ageGroup); + Set collect = sysFileExtraMapper.selectList(sysFileExtraQW).stream().map(SysFileExtra::getSysId).collect(Collectors.toSet()); + if (!CollectionUtils.isEmpty(collect)) { + qw.lambda().in(SysFile::getId, collect); + } + if (style.getId() != null) { qw.lambda().eq(SysFile::getLevel3Type, style.getName()); } diff --git a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java index 19e17489..7b53edf5 100644 --- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java @@ -742,7 +742,7 @@ public class WorkspaceServiceImpl extends ServiceImpl