From 821d852b5ba8eeabc1f3ac4f58faa77dc10af6c7 Mon Sep 17 00:00:00 2001
From: yang <2119157836@qq.com>
Date: Wed, 5 Feb 2025 11:16:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(mcwl-admin):=20=E4=BD=99=E9=A2=9D=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81=E7=82=B9=E8=B5=9E=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mcwl/web/controller/pay/AliPay/AliPayIntegration.java | 7 ++++++-
 .../resource/service/impl/WorkFlowLikeServiceImpl.java    | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayIntegration.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayIntegration.java
index ddee02f..4d02b0b 100644
--- a/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayIntegration.java
+++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayIntegration.java
@@ -16,6 +16,7 @@ import com.alipay.api.request.AlipayFundAccountQueryRequest;
 import com.alipay.api.request.AlipayFundTransUniTransferRequest;
 import com.alipay.api.response.AlipayFundAccountQueryResponse;
 import com.alipay.api.response.AlipayFundTransUniTransferResponse;
+import com.alipay.easysdk.base.oauth.models.AlipaySystemOauthTokenResponse;
 import com.alipay.easysdk.factory.Factory;
 import com.alipay.easysdk.kernel.Config;
 import com.alipay.easysdk.payment.facetoface.models.AlipayTradePrecreateResponse;
@@ -241,7 +242,11 @@ public class AliPayIntegration {
     /**
      * 查看余额
      */
-    public void balance() throws AlipayApiException {
+    public void balance() throws Exception {
+
+        AlipaySystemOauthTokenResponse token = Factory.Base.OAuth().getToken("code");
+
+
         // 初始化SDK
         AlipayClient alipayClient = new DefaultAlipayClient(getAlipayConfig());
 
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 e8d7a85..89bf75c 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
@@ -103,11 +103,19 @@ public class WorkFlowLikeServiceImpl extends ServiceImpl<WorkFlowLikeMapper, Wor
 
             // 获取用户信息
             SysUser sysUser = sysUserService.selectUserById(workFlowLike.getUserId());
+            if (Objects.isNull(sysUser)) {
+                page.setTotal(page.getTotal() - 1);
+                continue;
+            }
             workFlowLikeVo.setUserName(sysUser.getUserName());
             workFlowLikeVo.setUserAvatar(sysUser.getAvatar());
 
             // 获取工作流信息
             WorkFlow workFlow = workFlowMapper.selectById(workFlowLike.getWorkFlowId());
+            if (Objects.isNull(workFlow)) {
+                page.setTotal(page.getTotal() - 1);
+                continue;
+            }
             workFlowLikeVo.setConverPath(workFlow.getCoverPath());
             workFlowLikeVo.setLikeNum(workFlow.getLikeCount());