From d7c3b9d46cc331cfc57446d77c44e4c138addd72 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期六, 15 十月 2022 18:09:04 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' 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