魏超 5 лет назад
Родитель
Сommit
c71995bf1b

+ 14
- 1
src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java Просмотреть файл

11
 import com.huiju.estateagents.center.sysUser.entity.SysUser;
11
 import com.huiju.estateagents.center.sysUser.entity.SysUser;
12
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
12
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
13
 import com.huiju.estateagents.center.taUser.entity.TaUser;
13
 import com.huiju.estateagents.center.taUser.entity.TaUser;
14
+import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
14
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
15
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
15
 import com.huiju.estateagents.common.CommConstant;
16
 import com.huiju.estateagents.common.CommConstant;
16
 import com.huiju.estateagents.common.JWTUtils;
17
 import com.huiju.estateagents.common.JWTUtils;
17
 import com.huiju.estateagents.common.MD5Utils;
18
 import com.huiju.estateagents.common.MD5Utils;
19
+import com.huiju.estateagents.entity.SysMenu;
18
 import com.huiju.estateagents.entity.TaPerson;
20
 import com.huiju.estateagents.entity.TaPerson;
19
 import com.huiju.estateagents.entity.TaRole;
21
 import com.huiju.estateagents.entity.TaRole;
20
 import com.huiju.estateagents.service.ITaRoleService;
22
 import com.huiju.estateagents.service.ITaRoleService;
53
     @Autowired
55
     @Autowired
54
     private ITaRoleService iTaRoleService;
56
     private ITaRoleService iTaRoleService;
55
 
57
 
58
+    @Autowired
59
+    private ITaUserAuthMenuService iTaUserAuthMenuService;
60
+
56
     /**
61
     /**
57
      * 分页查询列表
62
      * 分页查询列表
58
      * @param pageNum
63
      * @param pageNum
194
     @RequestMapping(value="/admin/taUser/current",method= RequestMethod.GET)
199
     @RequestMapping(value="/admin/taUser/current",method= RequestMethod.GET)
195
     public ResponseBean taUserGetCurrent(HttpServletRequest request){
200
     public ResponseBean taUserGetCurrent(HttpServletRequest request){
196
         ResponseBean responseBean = new ResponseBean();
201
         ResponseBean responseBean = new ResponseBean();
202
+        Map userMap = new HashMap();
197
         Map map = JWTUtils.getUserIdAndOrgId(request);
203
         Map map = JWTUtils.getUserIdAndOrgId(request);
198
         try {
204
         try {
199
             TaUser taUser = iTaUserService.getById(map.get("userId").toString());
205
             TaUser taUser = iTaUserService.getById(map.get("userId").toString());
200
             List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
206
             List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
207
+            ResponseBean authMenu = iTaUserAuthMenuService.getMenuByUserId(null, null, taUser.getUserId().toString());
208
+            taUser.setMenus((List<SysMenu>) authMenu.getData());
201
             taUser.setRoles(roles);
209
             taUser.setRoles(roles);
202
             taUser.setLoginPassword("");
210
             taUser.setLoginPassword("");
203
-            responseBean.addSuccess(taUser);
211
+
212
+            //获取所有菜单
213
+            List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null).getData();
214
+            userMap.put("taUser", taUser);
215
+            userMap.put("menuList", allMenus);
216
+            responseBean.addSuccess(userMap);
204
         }catch (Exception e){
217
         }catch (Exception e){
205
             e.printStackTrace();
218
             e.printStackTrace();
206
             logger.error("taUserDelete -=- {}",e.toString());
219
             logger.error("taUserDelete -=- {}",e.toString());

+ 7
- 0
src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java Просмотреть файл

3
 import com.baomidou.mybatisplus.annotation.IdType;
3
 import com.baomidou.mybatisplus.annotation.IdType;
4
 import com.baomidou.mybatisplus.annotation.TableField;
4
 import com.baomidou.mybatisplus.annotation.TableField;
5
 import com.baomidou.mybatisplus.annotation.TableId;
5
 import com.baomidou.mybatisplus.annotation.TableId;
6
+import com.huiju.estateagents.entity.SysMenu;
6
 import com.huiju.estateagents.entity.TaMiniapp;
7
 import com.huiju.estateagents.entity.TaMiniapp;
7
 import com.huiju.estateagents.entity.TaRole;
8
 import com.huiju.estateagents.entity.TaRole;
8
 import lombok.Data;
9
 import lombok.Data;
127
      */
128
      */
128
     @TableField(exist = false)
129
     @TableField(exist = false)
129
     private List<TaRole> roles;
130
     private List<TaRole> roles;
131
+
132
+    /**
133
+     * 授权菜单列表
134
+     */
135
+    @TableField(exist = false)
136
+    private List<SysMenu> menus;
130
 }
137
 }