commit

src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareApplyController.java

@@ -108,6 +108,9 @@ public class ActivityDeclareApplyController {
         args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode());
         args.set(FlowConst.FORM_DATA, activityDeclareInfo);
         args.set("type", activityDeclareInfo.getActivityType());
+        if(StrUtil.isNotBlank(activityDeclareInfo.getClubId())) {
+            args.set("clubId", activityDeclareInfo.getClubId());
+        }
         ProcessInstance instance = flowEngine.startProcessInstanceByKey("HDSB", activityDeclareInfo.getId(), SecurityUtil.getUserId(), args);
 
         // 自动完成第一个申请任务

src/main/resources/static/assets/platform/js/util/commonUtil.js

@@ -327,6 +327,25 @@ function createLoading(text = '加载中...') {
     })
 }
 
+function getBaseSubAppPath() {
+    const pathname = window.location.pathname;
+    const startIndex = pathname.indexOf('/platform');
+    if (startIndex === -1) {
+        throw new Error('Target path not found in URL');
+    }
+    return pathname.substring(startIndex);
+}
+
+function getFullSubAppPath() {
+    const pathname = window.location.pathname;
+    const search = window.location.search; // 包含 ?appId=...
+    const startIndex = pathname.indexOf('/platform');
+    if (startIndex === -1) {
+        throw new Error('Target path not found in URL');
+    }
+    return pathname.substring(startIndex) + search;
+}
+
 
 
 

src/main/resources/views/layouts/platform.html

@@ -345,10 +345,10 @@ layout("/layouts/v4/baseLayout.html"){
                     }
                 }
             },
-
             // 菜单回显
             echoMenus() {
                 try {
+                    debugger
                     const app = JSON.parse(window.sessionStorage.getItem("zhgh_sub_app"))
                     this.activeMenuIndex = window.sessionStorage.getItem("zhgh_sub_app_left_menu_active_index-" + app.id)
                     this.openedMenus = JSON.parse(window.sessionStorage.getItem("zhgh_sub_app_left_menu_opens-" + app.id)) || []
@@ -356,7 +356,7 @@ layout("/layouts/v4/baseLayout.html"){
                     console.log(this.activeMenuIndex)
 
                     // !this.activeMenuIndex &&
-                    if ('/platform/v4/subApp' === window.location.pathname) {
+                    if ('/platform/v4/subApp' === getBaseSubAppPath()) {
                         this.defaultSelect()
                     } else {
                         this.hrefSelect()
@@ -386,8 +386,8 @@ layout("/layouts/v4/baseLayout.html"){
                     return search(menus, []);
                 }
 
-                const result = findMenuPath(this.menus, window.location.pathname)
-
+                const result = findMenuPath(this.menus, getBaseSubAppPath())
+                    debugger
                 if(result){
                     this.activeMenuIndex = result[result.length-1]['id']
                     this.openedMenus = result.map(v=>v.id)
@@ -439,7 +439,7 @@ layout("/layouts/v4/baseLayout.html"){
 
             init() {
                 // 页面加载时获取到正确的菜单
-                const pathname = window.location.pathname
+                const pathname = getFullSubAppPath()
                 if (!pathname.startsWith("/platform/v4/subApp")) {
                     this.$axios.post("/platform/sys/user/rootMenuByPath", {pathname}).then((res) => {
                         if (res.code === 0) {

src/main/resources/views/layouts/v4/baseLayout.html

@@ -149,7 +149,8 @@
                 }
 
                 connect() {
-                    const WS_URL = window.location.host + "${base}/websocket"
+                    //const WS_URL = window.location.host + "${base}/websocket"
+                    const WS_URL = 'zhgh.jshvc.edu.cn' + "${base}/websocket"
                     const protocol = window.location.protocol === "http:" ? "ws://" : "wss://"
                     this.ws = new WebSocket(protocol + WS_URL)
                 }
@@ -683,7 +684,7 @@
             $(document).ready(function () {
                 // 控制页脚显示的函数
                 function toggleFooter() {
-                    var currentPath = window.location.pathname
+                    var currentPath = getBaseSubAppPath()
                     var footer = $("#v4-footer")
 
                     if (currentPath === "/platform/v4/home") {
@@ -695,7 +696,7 @@
 
                 // 初始化：根据当前URL设置active状态
                 function setActiveNavItem() {
-                    var currentPath = window.location.pathname
+                    var currentPath = getBaseSubAppPath()
                     $(".v4-nav-item").removeClass("active")
                     $(".v4-nav-item").each(function () {
                         if ($(this).attr("href") === currentPath) {

src/main/resources/views/layouts/v4/platform.html

@@ -282,7 +282,7 @@
             $(document).ready(function() {
                 // 初始化：根据当前URL设置active状态
                 function setActiveNavItem() {
-                    var currentPath = window.location.pathname;
+                    var currentPath = getBaseSubAppPath();
                     $('.v4-nav-item').removeClass('active');
                     $('.v4-nav-item').each(function() {
                         if ($(this).attr('href') === currentPath) {