获取当前用户信息

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

@@ -11,10 +11,12 @@ import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.entity.SysUser;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.entity.SysMenu;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRole;
 import com.huiju.estateagents.service.ITaRoleService;
@@ -53,6 +55,9 @@ public class TaUserController extends BaseController {
     @Autowired
     private ITaRoleService iTaRoleService;
 
+    @Autowired
+    private ITaUserAuthMenuService iTaUserAuthMenuService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -194,13 +199,21 @@ public class TaUserController extends BaseController {
     @RequestMapping(value="/admin/taUser/current",method= RequestMethod.GET)
     public ResponseBean taUserGetCurrent(HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        Map userMap = new HashMap();
         Map map = JWTUtils.getUserIdAndOrgId(request);
         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());
+            taUser.setMenus((List<SysMenu>) authMenu.getData());
             taUser.setRoles(roles);
             taUser.setLoginPassword("");
-            responseBean.addSuccess(taUser);
+
+            //获取所有菜单
+            List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null).getData();
+            userMap.put("taUser", taUser);
+            userMap.put("menuList", allMenus);
+            responseBean.addSuccess(userMap);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taUserDelete -=- {}",e.toString());

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.center.taUser.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.huiju.estateagents.entity.SysMenu;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaRole;
 import lombok.Data;
@@ -127,4 +128,10 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private List<TaRole> roles;
+
+    /**
+     * 授权菜单列表
+     */
+    @TableField(exist = false)
+    private List<SysMenu> menus;
 }