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

dev环境暂时不上生产的变更

Browse Source
This commit is contained in:
xupei
2025-09-26 21:46:49 +08:00
parent 0f084c27ea
commit 9110e0dd34
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/ai/da/model/dto/ProjectQueryDTO.java
View File

@@ -38,8 +38,8 @@ public class ProjectQueryDTO extends PageQueryBaseVo {
private Integer intersection;
// todo 获取历史列表，允许传入多个类型
private List<String> process;
// private String process;
// private List<String> process;
private String process;
private Integer asc;
}

7
src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
View File

@@ -1726,10 +1726,11 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
if (Objects.nonNull(query.getEndDate())) {
queryWrapper.le("update_time", new Date(query.getEndDate()));
}
if (Objects.nonNull(query.getProcess()) && !query.getProcess().isEmpty()) {
// if (Objects.nonNull(query.getProcess()) && !query.getProcess().isEmpty()) {
if (!StringUtils.isEmpty(query.getProcess())) {
// todo 获取历史列表，允许传入多个类型
queryWrapper.in("process", query.getProcess());
// queryWrapper.eq("process", query.getProcess());
// queryWrapper.in("process", query.getProcess());
queryWrapper.eq("process", query.getProcess());
}
// 新增分类过滤
if (CollectionUtil.isNotEmpty(query.getClassificationIdList())) {