From 2d12350faf338e2f9b642c535822aa5082441719 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 10 十月 2022 11:12:19 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

---
 flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java b/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
index 873f6e2..269b9f5 100644
--- a/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
+++ b/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
@@ -41,6 +41,7 @@
             //从数据库中查询并返回
             return userService.selectData(currentUserId+"");
         }
-        throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);
+        return null;
+//        throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);
     }
 }

--
Gitblit v1.7.1