From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001 From: zqy <2522236926@qq.com> Date: 星期三, 06 八月 2025 15:37:20 +0800 Subject: [PATCH] 用户修改姓名和电话同步修改uaid --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 32 +++++++++++++++++++++++++------- 1 files changed, 25 insertions(+), 7 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index be7a146..5ca7188 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -8,6 +8,9 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; + +import com.ruoyi.domain.ZfAncestor; +import com.ruoyi.service.ZfAncestorService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.constant.Constants; @@ -44,6 +47,10 @@ @Autowired private SysRoleMenuMapper roleMenuMapper; + + @Autowired + private ZfAncestorService zfService; + /** * 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃 * @@ -67,11 +74,11 @@ { List<SysMenu> menuList = null; // 绠$悊鍛樻樉绀烘墍鏈夎彍鍗曚俊鎭� - if (SysUser.isAdmin(userId)) - { - menuList = menuMapper.selectMenuList(menu); - } - else +// if (SysUser.isAdmin(userId)) +// { +// menuList = menuMapper.selectMenuList(menu); +// } +// else { menu.getParams().put("userId", userId); menuList = menuMapper.selectMenuListByUserId(menu); @@ -131,9 +138,20 @@ public List<SysMenu> selectMenuTreeByUserId(Long userId) { List<SysMenu> menus = null; - if (SecurityUtils.isAdmin(userId)) + ZfAncestor zfAncestor = new ZfAncestor(); + zfAncestor.setSysId(userId); + zfAncestor = zfService.selectZfAncestor(zfAncestor); + System.out.println("---------++++++++____________"); + System.out.println(zfAncestor); + //鍒ゆ柇鏄惁鏄秴绾х鐞嗗憳 + if(zfAncestor!=null && zfAncestor.getId()==1L && zfAncestor.getRoleId()==0L) { - //濡傛灉鏄秴绾х鐞嗗憳锛屾妸宸︿晶鎵�鏈夌殑鐩綍鍜岃彍鍗曢兘鏌ュ嚭鏉� + menus = menuMapper.selectMenuTreeAllSuperAdmin(); + + } + else if(zfAncestor!=null && zfAncestor.getRoleId()==2) + { + //濡傛灉鏄櫘閫氱鐞嗗憳锛屾妸鏅�氱鐞嗗憳鐨勮彍鍗曟樉绀哄嚭鏉� menus = menuMapper.selectMenuTreeAll(); } else -- Gitblit v1.9.1