权限

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserAuthMenuController.java

@@ -49,7 +49,7 @@ public class TaUserAuthMenuController extends BaseController {
     @RequestMapping(value="/admin/menuList",method= RequestMethod.GET)
     public ResponseBean getMenuByRole(@RequestParam("pageNum")Integer pageNum,
                                       @RequestParam("pageSize")Integer pageSize, HttpServletRequest request){
-        return iTaUserAuthMenuService.getAllMenu(pageNum, pageSize, getOrgId(request));
+        return iTaUserAuthMenuService.getAllMenu(pageNum, pageSize, getOrgId(request), null);
     }
 
     /**

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -299,7 +299,7 @@ public class TaUserController extends BaseController {
             taUser.setLoginPassword("");
 
             //获取所有菜单
-            List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null,taUser.getOrgId()).getData();
+            List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null,taUser.getOrgId(), roles).getData();
             List<SysButtonInMenu> allButtons = (List<SysButtonInMenu>) iTaUserAuthButtonService.getAllButton(null, null).getData();
 
             userMap.put("taUser", taUser);

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserAuthMenuService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.SysButtonInMenu;
 import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.entity.TaRole;
 
 import java.util.List;
 
@@ -17,7 +18,7 @@ public interface ITaUserAuthMenuService extends IService<SysMenu> {
 
     ResponseBean getMenuByUserId(Integer pageNum, Integer pageSize, String userId, Integer orgId);
 
-    ResponseBean getAllMenu(Integer pageNum, Integer pageSize, Integer orgId);
+    ResponseBean getAllMenu(Integer pageNum, Integer pageSize, Integer orgId, List<TaRole> roles);
 
     ResponseBean updateUserAuthMenu(Integer userId, List<SysMenu> sysMenuList,String name,Integer orgid,List<SysButtonInMenu> sysButtonInMenuList);
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserAuthMenuServiceImpl.java

@@ -9,11 +9,14 @@ import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -78,7 +81,7 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
     }
 
     @Override
-    public ResponseBean getAllMenu(Integer pageNum, Integer pageSize, Integer orgId) {
+    public ResponseBean getAllMenu(Integer pageNum, Integer pageSize, Integer orgId, List<TaRole> userRoles) {
         List<SysMenu> records = new ArrayList<>();
         List<SysMenu> menuList = taUserAuthMenuMapper.sysMenuListByRoleId();
         records.addAll(menuList);
@@ -90,13 +93,14 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
         sysAdvancedConfigRelationQueryWrapper.eq("target_type",CommConstant.ADVANCED_TYPE_MENU);
         sysAdvancedConfigRelationQueryWrapper.notIn(taAdvancedControllerList.size() > 0,"advanced_config_id",taAdvancedControllerList.stream().map(TaAdvancedController::getAdvancedConfigId).collect(Collectors.toList()));
         List<SysAdvancedConfigRelation> sysAdvancedConfigRelations = sysAdvancedConfigRelationMapper.selectList(sysAdvancedConfigRelationQueryWrapper);
-        menuList.forEach(e -> {
-            sysAdvancedConfigRelations.forEach(s -> {
-                if (e.getMenuId() == Integer.valueOf(s.getTargetId())){
-                    records.remove(e);
-                }
-            });
-        });
+
+        List<TaRoleMenu> configRelationRoleMenuList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(userRoles) && CollectionUtils.isNotEmpty(sysAdvancedConfigRelations)){
+            QueryWrapper<TaRoleMenu> taRoleMenuQueryWrapper = new QueryWrapper<>();
+            taRoleMenuQueryWrapper.in("role_id", userRoles.stream().map(TaRole::getRoleId).collect(Collectors.toList()));
+            taRoleMenuQueryWrapper.in("menu_id", sysAdvancedConfigRelations.stream().map(SysAdvancedConfigRelation::getTargetId).collect(Collectors.toList()));
+            configRelationRoleMenuList = taRoleMenuMapper.selectList(taRoleMenuQueryWrapper);
+        }
 
         QueryWrapper<TaRoleMenu> queryWrapper = new QueryWrapper();
         List<TaRoleMenu> taRoleMenus = taRoleMenuMapper.selectList(queryWrapper);
@@ -108,6 +112,11 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
                     roles.add(taRoleMenu.getRoleId());
                 }
             }
+            for (TaRoleMenu taRoleMenu : configRelationRoleMenuList){
+                if (sysMenu.getMenuId().equals(taRoleMenu.getMenuId())){
+                    roles.remove(taRoleMenu.getRoleId());
+                }
+            }
             sysMenu.setRoles(roles);
         }