Merge remote-tracking branch 'origin/developer' into developer

byit-myth-core/myth-core-common/src/main/java/com/byit/job/utils/JwtHelper.java

@@ -27,12 +27,8 @@ public class JwtHelper {
         String account = String.valueOf(body.get(BaseContextConstants.JWT_KEY_ACCOUNT));
         String name = String.valueOf(body.get(BaseContextConstants.JWT_KEY_NAME));
 
-        String strOrgId = String.valueOf(body.get(BaseContextConstants.JWT_KEY_ORG_ID));
-        String strDepartmentId = String.valueOf(body.get(BaseContextConstants.JWT_KEY_STATION_ID));
         Long userId = Long.valueOf(strUserId);
-        Long orgId = Long.valueOf(strOrgId);
-        Long departmentId = Long.valueOf(strDepartmentId);
-        return new JwtUserInfo(userId, account, name, orgId, departmentId);
+        return new JwtUserInfo(userId, account, name, null, null);
     }