登陆用户增加企业类型,admin菜单查询不显示问题

tianhu-system/src/main/java/com/tianhu/system/controller/SysUserController.java

@@ -69,6 +69,8 @@ public class SysUserController extends BaseController
     private TokenService tokenService;
     @Autowired
     private ISysUserCompanyRelService userCompanyRelService;
+    @Autowired
+    private ISysCompanyService companyService;
 
 
 
@@ -130,6 +132,8 @@ public class SysUserController extends BaseController
         } else if (userCompanyRelList.size() == 1) {
             resMap.put("code", "1");
             resMap.put("message", "用户已绑定一家企业");
+
+
             // 绑定企业
             sysUser.setCompanyId(userCompanyRelList.get(0).getSucrCompanyId());
             // 不是平台
@@ -138,6 +142,12 @@ public class SysUserController extends BaseController
                 sysUser.setDeptId(userCompanyRelList.get(0).getSucrDeptId());
                 SysDept dept = deptService.selectDeptById(userCompanyRelList.get(0).getSucrDeptId());
                 sysUser.setDept(dept);
+                // 存放企业类型
+                SysCompany company = companyService.getById(userCompanyRelList.get(0).getSucrCompanyId());
+                sysUser.setCompanyType(company.getScyType());
+             // 平台用户
+            } else {
+                sysUser.setCompanyType("00");
             }
             // 角色集合
             Set<String> roles = permissionService.getRolePermission(sysUser.getUserId());

tianhu-system/src/main/java/com/tianhu/system/service/impl/SysMenuServiceImpl.java

@@ -3,6 +3,7 @@ package com.tianhu.system.service.impl;
 import com.tianhu.common.core.constant.UserConstants;
 import com.tianhu.common.core.utils.SecurityUtils;
 import com.tianhu.common.core.utils.StringUtils;
+import com.tianhu.common.security.service.TokenService;
 import com.tianhu.system.api.domain.SysRole;
 import com.tianhu.system.api.domain.SysUser;
 import com.tianhu.system.domain.SysMenu;
@@ -47,6 +48,9 @@ public class SysMenuServiceImpl implements ISysMenuService
     @Autowired
     private ISysPermissionService permissionService;
 
+    @Autowired
+    private TokenService tokenService;
+
     /**
      * 根据用户查询系统菜单列表
      * 
@@ -71,7 +75,8 @@ public class SysMenuServiceImpl implements ISysMenuService
         //TODO sunbzh
         System.out.println("新增角色获取菜单列表 serviceImpl");
 //        获取用户信息
-        SysUser user = userService.selectUserById(userId);
+//        SysUser user = userService.selectUserById(userId);
+        SysUser user = tokenService.getLoginUser().getSysUser();
         String companyId = user.getCompanyId();
         List<SysMenu> menuList = null;
         if(SysConstant.PLATFORM_NO.equals(companyId)){