From ff140258127325c19eba20730bf23e0ab8f5e22c Mon Sep 17 00:00:00 2001 From: yang <2119157836@qq.com> Date: Tue, 11 Mar 2025 16:42:07 +0800 Subject: [PATCH] =?UTF-8?q?feat(resource):=20=E8=B0=83=E6=95=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD=E5=92=8C=E6=95=B0=E6=8D=AE=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/service/impl/ModelImageLikeServiceImpl.java | 3 ++- .../mcwl/resource/service/impl/ModelLikeServiceImpl.java | 4 +++- .../resource/service/impl/WorkFlowLikeServiceImpl.java | 3 ++- .../main/resources/mapper/resource/ModelImageMapper.xml | 4 ++-- .../src/main/resources/mapper/resource/ModelMapper.xml | 8 ++++---- .../resources/mapper/resource/SysUserAttentionMapper.xml | 4 ++-- .../src/main/resources/mapper/resource/WorkFlowMapper.xml | 2 +- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageLikeServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageLikeServiceImpl.java index f33d86b..2f22683 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageLikeServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageLikeServiceImpl.java @@ -115,7 +115,8 @@ public class ModelImageLikeServiceImpl extends ServiceImpl() + .eq(ModelImageLike::getUserId, SecurityUtils.getUserId())); // 获取分页数据 List modelImageList = page.getRecords(); diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelLikeServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelLikeServiceImpl.java index acc8046..5092fcb 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelLikeServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelLikeServiceImpl.java @@ -1,6 +1,7 @@ package com.mcwl.resource.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -88,7 +89,8 @@ public class ModelLikeServiceImpl extends ServiceImpl page = initPage(pageDomain); - baseMapper.selectPage(page, null); + baseMapper.selectPage(page, new LambdaQueryWrapper() + .eq(ModelLike::getUserId, SecurityUtils.getUserId())); List modelLikeList = page.getRecords(); List modelLikeVoList = new ArrayList<>(); diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowLikeServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowLikeServiceImpl.java index 09568bc..56a0b31 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowLikeServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowLikeServiceImpl.java @@ -95,7 +95,8 @@ public class WorkFlowLikeServiceImpl extends ServiceImpl page = initPage(pageDomain); - baseMapper.selectPage(page, null); + baseMapper.selectPage(page, new LambdaQueryWrapper() + .eq(WorkFlowLike::getUserId, SecurityUtils.getUserId())); List workFlowLikeList = page.getRecords(); List modelLikeVoList = new ArrayList<>(); diff --git a/mcwl-resource/src/main/resources/mapper/resource/ModelImageMapper.xml b/mcwl-resource/src/main/resources/mapper/resource/ModelImageMapper.xml index b7db3c8..84579c3 100644 --- a/mcwl-resource/src/main/resources/mapper/resource/ModelImageMapper.xml +++ b/mcwl-resource/src/main/resources/mapper/resource/ModelImageMapper.xml @@ -15,7 +15,7 @@ - SELECT sum(numbers)sum FROM model where user_id = #{userId} ORDER BY(user_id); + SELECT COALESCE(sum(numbers), 0) sum FROM model where user_id = #{userId} ORDER BY(user_id); diff --git a/mcwl-resource/src/main/resources/mapper/resource/WorkFlowMapper.xml b/mcwl-resource/src/main/resources/mapper/resource/WorkFlowMapper.xml index e4afd0d..2d96f8e 100644 --- a/mcwl-resource/src/main/resources/mapper/resource/WorkFlowMapper.xml +++ b/mcwl-resource/src/main/resources/mapper/resource/WorkFlowMapper.xml @@ -57,7 +57,7 @@