From 1ee5a1003b4140cbd23ea9a5d38f6c99f0f77cc6 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期日, 09 十月 2022 11:23:42 +0800
Subject: [PATCH] 修改组织机构删除

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

diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index 60a14c6..8e80ef0 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -50,7 +50,7 @@
 
         SysUser user=null;
         //管理员登录
-        if(!StringUtils.isEmpty(account))
+        if(StringUtils.equals("zigonggaoadmin",account))
         {
             user= IUserService.getUserByAccount(account);
 
@@ -109,7 +109,6 @@
         }
 
         String token = tokenManager.getTokenByUserId(user.getUserId());
-//        String token = tokenManager.createToken(user.getUserId(), user.getRoleId());
         System.out.println("token "+token);
         if (token == null) {
             //生成一个token,保存用户登录状态
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 7d987dc..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,9 +41,7 @@
             //从数据库中查询并返回
             return userService.selectData(currentUserId+"");
         }
-
         return null;
-
 //        throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);
     }
 }

--
Gitblit v1.7.1