From 2f22c6ea825cc32975dfa4eaaa23649c6f633682 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 09 二月 2026 16:03:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 14 ++++++++++++++
src/main/java/com/ruoyi/project/system/service/impl/UnipushService.java | 24 +++++++++++++-----------
2 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
index 14fe835..2aa03b2 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -166,6 +166,20 @@
.eq(CommonFile::getCommonId, record.getId())
.eq(CommonFile::getType, FileNameType.ApproveProcess.getValue()));
record.setCommonFileList(commonFiles);
+ // 閲囪喘瀹℃壒鏌ヨ閲囪喘闄勪欢
+ if (approveProcess.getApproveType() == 5) {
+ List<CommonFile> commonFiles1 = commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
+ .eq(CommonFile::getCommonId, record.getId())
+ .eq(CommonFile::getType, FileNameType.PURCHASE.getValue()));
+ record.setCommonFileList(commonFiles1);
+ }
+ // 鍙戣揣瀹℃壒鏌ヨ鍙戣揣闄勪欢
+ if (approveProcess.getApproveType() == 7) {
+ List<CommonFile> commonFiles1 = commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
+ .eq(CommonFile::getCommonId, record.getId())
+ .eq(CommonFile::getType, FileNameType.SHIP.getValue()));
+ record.setCommonFileList(commonFiles1);
+ }
}
return approveProcessIPage;
}
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/UnipushService.java b/src/main/java/com/ruoyi/project/system/service/impl/UnipushService.java
index 0a33b66..7284ace 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/UnipushService.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/UnipushService.java
@@ -108,13 +108,12 @@
queryString = webPath.substring(index);
}
- String[] pathSegments = pathOnly.split("/");
- String lastSegment = "";
- for (int i = pathSegments.length - 1; i >= 0; i--) {
- if (StringUtils.isNotEmpty(pathSegments[i])) {
- lastSegment = pathSegments[i];
- break;
- }
+ String lastSegment;
+ int lastSlashIndex = pathOnly.lastIndexOf("/");
+ if (lastSlashIndex != -1) {
+ lastSegment = pathOnly.substring(lastSlashIndex + 1);
+ } else {
+ lastSegment = pathOnly;
}
if (StringUtils.isEmpty(lastSegment)) {
@@ -124,11 +123,14 @@
SysMenu menu = sysMenuMapper.selectMenuByPath(lastSegment);
if (menu != null && StringUtils.isNotEmpty(menu.getAppComponent())) {
- String appComponent = menu.getAppComponent();
- if (appComponent.startsWith("/")) {
- appComponent = appComponent.substring(1);
+ String appPath = menu.getAppComponent();
+
+ if (appPath.startsWith("/")) {
+ appPath = appPath.substring(1);
}
- return appComponent + queryString;
+
+ // 鎷兼帴 Web 绔師濮嬪弬鏁板苟杩斿洖
+ return appPath + queryString;
}
return DEFAULT_APP_PAGE;
--
Gitblit v1.9.3