From 34e183fbfed4688f25b375d4966b937f52228827 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 17 六月 2024 10:34:19 +0800
Subject: [PATCH] 报错

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java      |    4 ++--
 ruoyi-api/ruoyi-api-parent/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java |    5 -----
 ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java                           |    2 +-
 ruoyi-api/ruoyi-api-parent/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java      |    4 ++--
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java |    5 +----
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java       |    6 +++---
 6 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-parent/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java b/ruoyi-api/ruoyi-api-parent/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
index 83a7f0c..15a56aa 100644
--- a/ruoyi-api/ruoyi-api-parent/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-parent/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
@@ -26,11 +26,6 @@
             }
 
             @Override
-            public R<Boolean> updateSysUser(SysUser sysUser) {
-                return R.fail("更新用户失败:" + cause.getMessage());
-            }
-
-            @Override
             public R<List<Integer>> companySaveSysUser(CompanyAddSysUserDto dto) {
                 return R.fail("添加用户失败:" + cause.getMessage());
             }
diff --git a/ruoyi-api/ruoyi-api-parent/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java b/ruoyi-api/ruoyi-api-parent/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
index 9b4b104..5c94321 100644
--- a/ruoyi-api/ruoyi-api-parent/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
+++ b/ruoyi-api/ruoyi-api-parent/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
@@ -23,8 +23,8 @@
     @PostMapping("/user/getSysUser")
     R<SysUser> getSysUser(Long userId);
 
-    @PostMapping("/user/updateSysUser")
-    R<Boolean>  updateSysUser(@RequestBody SysUser sysUser);
+//    @PostMapping("/user/updateSysUser")
+//    R<Boolean>  updateSysUser(@RequestBody SysUser sysUser);
 
     @PostMapping("/user/companySaveSysUser")
     R<List<Integer>> companySaveSysUser(@RequestBody CompanyAddSysUserDto dto);
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
index 83a7f0c..c8d9ea0 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
@@ -25,10 +25,7 @@
                 return R.fail("获取用户失败:" + cause.getMessage());
             }
 
-            @Override
-            public R<Boolean> updateSysUser(SysUser sysUser) {
-                return R.fail("更新用户失败:" + cause.getMessage());
-            }
+
 
             @Override
             public R<List<Integer>> companySaveSysUser(CompanyAddSysUserDto dto) {
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
index 9b4b104..5c94321 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
@@ -23,8 +23,8 @@
     @PostMapping("/user/getSysUser")
     R<SysUser> getSysUser(Long userId);
 
-    @PostMapping("/user/updateSysUser")
-    R<Boolean>  updateSysUser(@RequestBody SysUser sysUser);
+//    @PostMapping("/user/updateSysUser")
+//    R<Boolean>  updateSysUser(@RequestBody SysUser sysUser);
 
     @PostMapping("/user/companySaveSysUser")
     R<List<Integer>> companySaveSysUser(@RequestBody CompanyAddSysUserDto dto);
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index b9f650b..f972a19 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -63,7 +63,7 @@
         sysUser.setUserId(userInfo.getSysUser().getUserId());
         sysUser.setLoginDate(new Date());
         System.out.println("修改用户登录时间"+sysUser);
-        userClient.updateSysUser(sysUser);
+//        userClient.updateSysUser(sysUser);
         // 获取登录token
         return R.ok(map);
     }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
index f54d960..47a6f42 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -179,9 +179,9 @@
         // 获取所有菜单ids
         List<Long> menusId1 = menuMapper.selectList(new LambdaQueryWrapper<SysMenu>()).stream().map(SysMenu::getMenuId).collect(Collectors.toList());
 
-//        if(menusId.size()==0){
-//            return AjaxResult.success(new ArrayList<>());
-//        }
+        if(CollectionUtils.isEmpty(menusId)){
+            return AjaxResult.success(new ArrayList<>());
+        }
 
         //获取所有的权限菜单
         List<SysMenus> all = menuMapper.getAllInIds(menusId1);

--
Gitblit v1.7.1