新需求

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

@@ -2,13 +2,11 @@ package com.huiju.estateagents.center.taUser.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.google.gson.JsonArray;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
 import com.huiju.estateagents.entity.SysButtonInMenu;
 import com.huiju.estateagents.entity.SysMenu;
-import com.huiju.estateagents.entity.TaRole;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -39,7 +37,7 @@ public class TaUserAuthMenuController extends BaseController {
                                          @RequestParam("pageSize")Integer pageSize,
                                          HttpServletRequest request){
         Integer userId = getUserId(request);
-        return iTaUserAuthMenuService.getMenuByUserId(pageNum,pageSize,userId.toString());
+        return iTaUserAuthMenuService.getMenuByUserId(pageNum,pageSize,userId.toString(), getOrgId(request));
     }
 
     /**
@@ -50,8 +48,8 @@ public class TaUserAuthMenuController extends BaseController {
      */
     @RequestMapping(value="/admin/menuList",method= RequestMethod.GET)
     public ResponseBean getMenuByRole(@RequestParam("pageNum")Integer pageNum,
-                                      @RequestParam("pageSize")Integer pageSize){
-        return iTaUserAuthMenuService.getAllMenu(pageNum, pageSize);
+                                      @RequestParam("pageSize")Integer pageSize, HttpServletRequest request){
+        return iTaUserAuthMenuService.getAllMenu(pageNum, pageSize, getOrgId(request));
     }
 
     /**

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

@@ -291,7 +291,7 @@ public class TaUserController extends BaseController {
         try {
             TaUser taUser = iTaUserService.getById(map.get("userId").toString());
             List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
-            ResponseBean authMenu = iTaUserAuthMenuService.getMenuByUserId(null, null, taUser.getUserId().toString());
+            ResponseBean authMenu = iTaUserAuthMenuService.getMenuByUserId(null, null, taUser.getUserId().toString(),taUser.getOrgId());
             ResponseBean authButton = iTaUserAuthButtonService.getButtonByUserId(null, null, taUser.getUserId().toString());
             taUser.setMenus((List<SysMenu>) authMenu.getData());
             taUser.setButtons((List<SysButtonInMenu>) authButton.getData());
@@ -299,7 +299,7 @@ public class TaUserController extends BaseController {
             taUser.setLoginPassword("");
 
             //获取所有菜单
-            List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null).getData();
+            List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null,taUser.getOrgId()).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

@@ -15,9 +15,9 @@ import java.util.List;
  */
 public interface ITaUserAuthMenuService extends IService<SysMenu> {
 
-    ResponseBean getMenuByUserId(Integer pageNum, Integer pageSize, String userId);
+    ResponseBean getMenuByUserId(Integer pageNum, Integer pageSize, String userId, Integer orgId);
 
-    ResponseBean getAllMenu(Integer pageNum, Integer pageSize);
+    ResponseBean getAllMenu(Integer pageNum, Integer pageSize, Integer orgId);
 
     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

@@ -1,25 +1,21 @@
 package com.huiju.estateagents.center.taUser.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserAuthMenuMapper;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
-import com.huiju.estateagents.mapper.TaRoleButtonMapper;
-import com.huiju.estateagents.mapper.TaRoleMapper;
-import com.huiju.estateagents.mapper.TaRoleMenuMapper;
+import com.huiju.estateagents.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author weicc
@@ -44,24 +40,63 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
     @Autowired
     private TaRoleButtonMapper taRoleButtonMapper;
 
+    @Autowired
+    private TaAdvancedControllerMapper taAdvancedControllerMapper;
+
+    @Autowired
+    private SysAdvancedConfigRelationMapper sysAdvancedConfigRelationMapper;
+
     /**
      * 根据用户id获取授权菜单
      * @param pageNum
      * @param pageSize
      * @param userId
+     * @param orgId
      * @return
      */
     @Override
-    public ResponseBean getMenuByUserId(Integer pageNum, Integer pageSize, String userId) {
-
-        List<SysMenu> records = taUserAuthMenuMapper.sysMenuListByUserId(userId);
+    public ResponseBean getMenuByUserId(Integer pageNum, Integer pageSize, String userId, Integer orgId) {
+        List<SysMenu> records = new ArrayList<>();
+        List<SysMenu> menuList = taUserAuthMenuMapper.sysMenuListByUserId(userId);
+        records.addAll(menuList);
+        //添加高级配置的过滤条件
+        List<TaAdvancedController> taAdvancedControllerList = taAdvancedControllerMapper.selectList(new QueryWrapper<TaAdvancedController>().eq("org_id", orgId));
+
+        //需要过滤的菜单
+        QueryWrapper<SysAdvancedConfigRelation> sysAdvancedConfigRelationQueryWrapper = new QueryWrapper<>();
+        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);
+                }
+            });
+        });
         return ResponseBean.success(records);
     }
 
     @Override
-    public ResponseBean getAllMenu(Integer pageNum, Integer pageSize) {
-
-        List<SysMenu> records = taUserAuthMenuMapper.sysMenuListByRoleId();
+    public ResponseBean getAllMenu(Integer pageNum, Integer pageSize, Integer orgId) {
+        List<SysMenu> records = new ArrayList<>();
+        List<SysMenu> menuList = taUserAuthMenuMapper.sysMenuListByRoleId();
+        records.addAll(menuList);
+        //添加高级配置的过滤条件
+        List<TaAdvancedController> taAdvancedControllerList = taAdvancedControllerMapper.selectList(new QueryWrapper<TaAdvancedController>().eq("org_id", orgId));
+
+        //需要过滤的菜单
+        QueryWrapper<SysAdvancedConfigRelation> sysAdvancedConfigRelationQueryWrapper = new QueryWrapper<>();
+        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);
+                }
+            });
+        });
 
         QueryWrapper<TaRoleMenu> queryWrapper = new QueryWrapper();
         List<TaRoleMenu> taRoleMenus = taRoleMenuMapper.selectList(queryWrapper);

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -680,4 +680,9 @@ public class CommConstant {
      * 最大认筹金额
      */
     public static final Integer MAX_RAISE_PRICE = 5000;
+
+    /**
+     * 菜单
+     */
+    public static final Object ADVANCED_TYPE_MENU = "menu";
 }

src/main/java/com/huiju/estateagents/entity/SysAdvancedConfigRelation.java

@@ -39,5 +39,8 @@ public class SysAdvancedConfigRelation implements Serializable {
      */
     private String targetId;
 
-
+    /**
+     * 高级配置id
+     */
+    private Integer advancedConfigId;
 }