From 63eb003821e7b1e9eec62fbef9ab4770245b070f Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 18 十月 2022 14:23:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 d323cfa..6b28405 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
@@ -54,12 +54,14 @@
}
HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(currentUserId+"","","");
- sysUser=userService.selectData(null,huaChengSysUser.getPhone());
- if(sysUser!=null)
+ if(huaChengSysUser!=null)
{
- return sysUser;
+ sysUser=userService.selectData(null,huaChengSysUser.getPhone());
+ if(sysUser!=null)
+ {
+ return sysUser;
+ }
}
-
}
return null;
// throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);
--
Gitblit v1.7.1