From c7a59a0d992e47c80b0995247a581cf02853e630 Mon Sep 17 00:00:00 2001
From: yang <2119157836@qq.com>
Date: Wed, 5 Feb 2025 11:28:33 +0800
Subject: [PATCH] =?UTF-8?q?fix(resource):=20=E4=BF=AE=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E4=B8=BA=E7=A9=BA=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resource/service/impl/ModelImageLikeServiceImpl.java  | 8 ++++++++
 .../mcwl/resource/service/impl/ModelImageServiceImpl.java | 4 ++++
 .../mcwl/resource/service/impl/ModelLikeServiceImpl.java  | 8 ++++++++
 .../com/mcwl/resource/service/impl/ModelServiceImpl.java  | 4 ++++
 .../mcwl/resource/service/impl/WorkFlowServiceImpl.java   | 5 +++++
 5 files changed, 29 insertions(+)

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 4ce3bca..33419cc 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
@@ -116,11 +116,19 @@ public class ModelImageLikeServiceImpl extends ServiceImpl<ModelImageLikeMapper,
 
             // 获取用户信息
             SysUser sysUser = sysUserService.selectUserById(modelImageLike.getUserId());
+            if (Objects.isNull(sysUser)) {
+                page.setTotal(page.getTotal() - 1);
+                continue;
+            }
             modelImageLikeVo.setUserName(sysUser.getUserName());
             modelImageLikeVo.setUserAvatar(sysUser.getAvatar());
 
             // 获取图片信息
             ModelImage modelImage = modelImageMapper.selectById(modelImageLike.getModelImageId());
+            if (Objects.isNull(modelImage)) {
+                page.setTotal(page.getTotal() - 1);
+                continue;
+            }
             modelImageLikeVo.setImagePaths(modelImage.getImagePaths());
             modelImageLikeVo.setLikeNum(modelImage.getLikeNum());
 
diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java
index 8c821d3..8fb74bf 100644
--- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java
+++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java
@@ -201,6 +201,10 @@ public class ModelImageServiceImpl extends ServiceImpl<ModelImageMapper, ModelIm
             BeanUtil.copyProperties(modelImage, modelImageVo);
             // 获取用户信息
             SysUser sysUser = sysUserService.selectUserById(modelImage.getUserId());
+            if (Objects.isNull(sysUser)) {
+                page.setTotal(page.getTotal() - 1);
+                continue;
+            }
             modelImageVo.setUserId(sysUser.getUserId());
             modelImageVo.setUserName(sysUser.getUserName());
             modelImageVo.setUserAvatar(sysUser.getAvatar());
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 53a92e8..bb2d6b1 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
@@ -93,11 +93,19 @@ public class ModelLikeServiceImpl extends ServiceImpl<ModelLikeMapper, ModelLike
 
             // 获取用户信息
             SysUser sysUser = sysUserService.selectUserById(modelLike.getUserId());
+            if (Objects.isNull(sysUser)) {
+                page.setTotal(page.getTotal() - 1);
+                continue;
+            }
             modelLikeVo.setUserName(sysUser.getUserName());
             modelLikeVo.setUserAvatar(sysUser.getAvatar());
 
             // 获取模型信息
             ModelProduct modelProduct = modelMapper.selectById(modelLike.getModelId());
+            if (Objects.isNull(modelProduct)) {
+                page.setTotal(page.getTotal() - 1);
+                continue;
+            }
             modelLikeVo.setSurfaceUrl(modelProduct.getSurfaceUrl());
             modelLikeVo.setLikeNum(modelProduct.getLikeNum());
 
diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java
index 1799d32..2028325 100644
--- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java
+++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java
@@ -157,6 +157,10 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
             BeanUtil.copyProperties(modelImage, modelVo);
             // 获取用户信息
             SysUser sysUser = sysUserService.selectUserById(modelImage.getUserId());
+            if (Objects.isNull(sysUser)) {
+                page.setTotal(page.getTotal() - 1);
+                continue;
+            }
             modelVo.setUserId(sysUser.getUserId());
             modelVo.setUserName(sysUser.getUserName());
             modelVo.setUserAvatar(sysUser.getAvatar());
diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java
index c387858..2464738 100644
--- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java
+++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java
@@ -37,6 +37,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 工作流 业务实现层
@@ -381,6 +382,10 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
             BeanUtil.copyProperties(workFlow, workFlowVo);
             // 获取用户信息
             SysUser sysUser = sysUserService.selectUserById(workFlow.getUserId());
+            if (Objects.isNull(sysUser)) {
+                page.setTotal(page.getTotal() - 1);
+                continue;
+            }
             workFlowVo.setUserId(sysUser.getUserId());
             workFlowVo.setUserName(sysUser.getUserName());
             workFlowVo.setUserAvatar(sysUser.getAvatar());