lxzn-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java

@@ -66,6 +66,9 @@
        // update-begin--Author:lvdandan Date:20210105 for：JT-355 OA聊天添加token验证，获取token参数
        if (oConvertUtils.isEmpty(token)) {
            token = httpServletRequest.getParameter("token");
            if (oConvertUtils.isEmpty(token)) {
                token = httpServletRequest.getParameter("oauth2LoginToken");
            }
        }
        // update-end--Author:lvdandan Date:20210105 for：JT-355 OA聊天添加token验证，获取token参数


 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcBoardServiceImpl.java

@@ -342,12 +342,12 @@
                Object object = mapData.get("Sequencenumber");
                mdcBoardEquRealTImeVo.setSequenceNumber(object == null || "关机".equals(mdcBoardEquRealTImeVo.getOporationDict()) ? "" : object.toString());
            }
            if (mapData.containsKey("spindlespeed")) {
                Object object = mapData.get("spindlespeed");
                mdcBoardEquRealTImeVo.setSpindleSpeed(object == null || "关机".equals(mdcBoardEquRealTImeVo.getOporationDict()) ? "" : object.toString());
            }
            if (mapData.containsKey("actualspindlespeed")) {
                Object object = mapData.get("actualspindlespeed");
                mdcBoardEquRealTImeVo.setSpindleSpeed(object == null || "关机".equals(mdcBoardEquRealTImeVo.getOporationDict()) ? "" : object.toString());
            }
            if (mapData.containsKey("spindleload")) {
                Object object = mapData.get("spindleload");
                mdcBoardEquRealTImeVo.setSpindleLoad(object == null || "关机".equals(mdcBoardEquRealTImeVo.getOporationDict()) ? "" : object.toString());
            }
            if (mapData.containsKey("spindlebeilv")) {

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java

@@ -399,7 +399,7 @@
            state += "&thirdType=" + source;
            //state += "&thirdType=" + "wechat_enterprise";
            if (redirect != null && redirect.length() > 0) {
                state += "&" + redirect;
                state += "&redirect=" + redirect;
            }
            //update-end-author:taoyan date:2022-6-30 for: 工作流发送消息 点击消息链接跳转办理页面