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

liyong

4 天以前 2f22c6ea825cc32975dfa4eaaa23649c6f633682

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

 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;
    }

 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;