From b9385f1bdd7c0e85b140bc34a7567f6ca5bd1dae Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 04 六月 2021 10:31:49 +0800
Subject: [PATCH] 修改bug

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 4dbdf3a..3a270ca 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -951,14 +951,16 @@
 
 //        获取所有权限id
         List<SysMenuDO> menuDOList = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, 2l).orderByAsc(SysMenuDO::getOrderNum));
-        menuIds = menuDOList.stream().map(sysMenuDO -> sysMenuDO.getMenuId()).collect(Collectors.toList());
-        for (int i = 0; i < menuIds.size(); i++) {
-            SysRoleMenuDO sysRoleMenuDO = sysRoleMenuDAO.selectOne(new QueryWrapper<SysRoleMenuDO>().lambda().eq(SysRoleMenuDO::getMenuId,menuIds.get(i))
-                    .eq(SysRoleMenuDO::getRoleId,roleId));
-            if(sysRoleMenuDO == null){
-                sysRoleMenuDO.setMenuId(menuIds.get(i));
-                sysRoleMenuDO.setRoleId(roleId);
-                sysRoleMenuDAO.insert(sysRoleMenuDO);
+        if(!menuDOList.isEmpty()){
+            menuIds = menuDOList.stream().map(sysMenuDO -> sysMenuDO.getMenuId()).collect(Collectors.toList());
+            for (int i = 0; i < menuIds.size(); i++) {
+                SysRoleMenuDO sysRoleMenuDO = sysRoleMenuDAO.selectOne(new QueryWrapper<SysRoleMenuDO>().lambda().eq(SysRoleMenuDO::getMenuId,menuIds.get(i))
+                        .eq(SysRoleMenuDO::getRoleId,roleId));
+                if(sysRoleMenuDO == null){
+                    sysRoleMenuDO.setMenuId(menuIds.get(i));
+                    sysRoleMenuDO.setRoleId(roleId);
+                    sysRoleMenuDAO.insert(sysRoleMenuDO);
+                }
             }
         }
         return R.ok();

--
Gitblit v1.7.1