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

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

Browse Source
This commit is contained in:
litianxiang
2025-10-08 13:09:39 +08:00
parent 4fbacb37c1 9110e0dd34
commit ad2bb7062e
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1929,10 +1929,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())) {