创建团队角色问题

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/MaintenanceCompanyServiceImpl.java

@@ -129,7 +129,7 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         }
         //3.创建默认角色-企业管理员
         Role role = new Role();
-        role.setName(CommonEnum.DefaultRole.ENTERPRISE_ADMIN.getLabel());
+        role.setName(CommonEnum.DefaultRole.ENTERPRISE_ADMIN.getCode());
         role.setCompanyId(companyId);
         role.setDescription("企业管理员");
         if (!roleService.save(role)) {

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

@@ -5,12 +5,12 @@ import cn.com.ty.lift.common.constants.PushMessageConstants;
 import cn.com.ty.lift.common.model.PushUserInfo;
 import cn.com.ty.lift.system.user.dao.mapper.IPushUserMapper;
 import cn.com.xwy.boot.service.impl.BaseServiceImpl;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -104,7 +104,7 @@ public class PushUserService extends BaseServiceImpl<IPushUserMapper, PushUserIn
         return null;
     }
 
-    public PushUserInfo getUserInfoByUserId(Long userId){
+    public PushUserInfo getUserInfoByUserId(Long userId) {
         return this.baseMapper.getUserInfoByUserId(userId);
     }
 
@@ -126,7 +126,7 @@ public class PushUserService extends BaseServiceImpl<IPushUserMapper, PushUserIn
      * @date 2020/4/17 10:06 上午
      */
     private Long getCurrentUserId() {
-        return getAttributeFromSession(ApiConstants.CURRENT_USER_ID);
+        return getAttributeFromRequestHead(ApiConstants.CURRENT_USER_ID);
     }
 
 
@@ -136,32 +136,27 @@ public class PushUserService extends BaseServiceImpl<IPushUserMapper, PushUserIn
      * @date 2020/4/17 10:09 上午
      */
     private Long getCurrentCompanyId() {
-        return getAttributeFromSession(ApiConstants.CURRENT_COMPANY_ID);
+        return getAttributeFromRequestHead(ApiConstants.CURRENT_COMPANY_ID);
     }
 
-    /**
-     * @param attributeName 属性名
-     * @return 属性值
-     * @description 从session中获取
-     * @date 2020/4/17 10:09 上午
-     */
-    private Long getAttributeFromSession(String attributeName) {
-        HttpSession session = getHttpSession();
-        if (session != null) {
-            return (Long) session.getAttribute(attributeName);
+
+    private Long getAttributeFromRequestHead(String attributeName) {
+        HttpServletRequest request = getHttpRequest();
+        String attribute = request.getHeader(attributeName);
+        if(StringUtils.isNotBlank(attribute)) {
+            return Long.parseLong(request.getHeader(attributeName));
         }
         return null;
     }
 
     /**
-     * @return session
-     * @description 获取session
+     * @return request
+     * @description 获取request
      * @date 2020/4/17 10:06 上午
      */
-    private HttpSession getHttpSession() {
-        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(
+    private HttpServletRequest getHttpRequest() {
+        return ((ServletRequestAttributes) Objects.requireNonNull(
                 RequestContextHolder.getRequestAttributes())).getRequest();
-        return request.getSession();
     }
 
 }