请求方式处理

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/MenuController.java

@@ -50,7 +50,7 @@ public class MenuController {
      * @return
      */
     @PostMapping("/companyMenu")
-    public RestResponse companyMenu(MenuRequest menuRequest){
+    public RestResponse companyMenu(@RequestBody MenuRequest menuRequest){
         return menuService.companyMenu(menuRequest);
     }
 

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/RoleController.java

@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @author huangyuan
  * @date 2019-12-01
@@ -29,7 +31,7 @@ public class RoleController {
      * @date 2019/11/27 10:03 AM
      */
     @RequestMapping("/list")
-    public RestResponse list(RoleRequest roleRequest) {
+    public RestResponse list(HttpServletRequest request, @RequestBody RoleRequest roleRequest) {
         return roleService.list(roleRequest);
     }
 

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/LoginService.java

@@ -88,6 +88,13 @@ public class LoginService implements ILoginService {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "密码输入有误");
         }
         UserResponse userResponse = userService.getLoginUserInfo(userAccount.getUserId());
+
+        //将当前公司id放入session中
+        if(userResponse.getMaintenanceCompany() != null){
+            request.getSession().setAttribute(ApiConstants.CURRENT_COMPANY_ID, userResponse.getMaintenanceCompany().getId());
+        }
+        //将用户信息放入session中
+        request.getSession().setAttribute(ApiConstants.CURRENT_USER_ID, userResponse.getUserId());
         //将用户登录的信息放入redis中,作为缓存处理
         redisTemplate.opsForValue().set(userResponse.getToken(), JSONUtil.toJsonPrettyStr(userAccount));
         UserLogin userLogin = new UserLogin();

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/RoleService.java

@@ -50,6 +50,7 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> implements IRoleS
     public RestResponse list(RoleRequest roleRequest) {
         IPage<Role> rolePage = new Page<>(roleRequest.getPageNum(), roleRequest.getPageSize());
         rolePage = this.page(rolePage, new QueryWrapper<Role>()
+                .eq("company_id", roleRequest.getCompanyId())
                 .eq("delete_flag", ApiConstants.DELETE_NO)
         );
         return RestResponse.success(rolePage, ApiConstants.RESULT_SUCCESS, "获取角色列表成功");