From f85f8334bb0b3b5dc2cc5f6302741ef17e627686 Mon Sep 17 00:00:00 2001
From: HopeLi <1278288511@qq.com>
Date: Thu, 5 Jun 2025 19:49:03 +0800
Subject: [PATCH] 0605 ljc

---
 .../process/engine/context/ConstantContextHolder.java |  2 +-
 .../process/dataObject/base/BaseIdPageReq.java        |  2 +-
 .../service/report/impl/ReportServiceImpl.java        | 11 +++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/context/ConstantContextHolder.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/context/ConstantContextHolder.java
index 268ea4b3..3efb7268 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/context/ConstantContextHolder.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/context/ConstantContextHolder.java
@@ -52,6 +52,6 @@ public class ConstantContextHolder {
      * SCA默认写死
      */
     public static String getScaToken() {
-        return getSysConfigWithDefault("OPS_TOKEN_SCA", String.class, "6b906a14493644af801efbcdee7cd390");
+        return getSysConfigWithDefault("OPS_TOKEN_SCA", String.class, "9a4fcaeba3b54de1add6395b08217e5e");
     }
 }
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/base/BaseIdPageReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/base/BaseIdPageReq.java
index 8a86de01..c837e6fc 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/base/BaseIdPageReq.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/base/BaseIdPageReq.java
@@ -18,5 +18,5 @@ public class BaseIdPageReq extends PageParam {
     private List<String> idList;
     private String pid;
     private String childId;
-    private String projectId;
+    private Integer projectId;
 }
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/impl/ReportServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/impl/ReportServiceImpl.java
index 5406c68c..98bfb933 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/impl/ReportServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/report/impl/ReportServiceImpl.java
@@ -17,6 +17,7 @@ import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.client.RestTemplate;
 
 import java.security.KeyManagementException;
@@ -41,7 +42,7 @@ public class ReportServiceImpl implements ReportService {
     @Override
     public PageResult<ReportResp> findReportList(BaseIdPageReq req) throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
         RestTemplate restTemplate = getRestTemplateWithoutSANCheck();
-        String reportFindUrl = ConstantContextHolder.getScaIp() + "openapi/v1/asset/report/list";
+        String reportFindUrl = ConstantContextHolder.getScaIp() + "/openapi/v1/asset/report/list";
         MultiValueMap<String, Object> body = buildFindRequestBody(req);
         HttpHeaders headers = createHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
@@ -71,7 +72,7 @@ public class ReportServiceImpl implements ReportService {
     @Override
     public ReportResp deleteReport(ReportDeleteReq req) throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
         RestTemplate restTemplate = getRestTemplateWithoutSANCheck();
-        String reportDeleteUrl = ConstantContextHolder.getScaIp() + "openapi/v1/asset/report/delet";
+        String reportDeleteUrl = ConstantContextHolder.getScaIp() + "/openapi/v1/asset/report/delet";
         MultiValueMap<String, Object> body = buildDeleteRequestBody(req);
         HttpHeaders headers = createHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
@@ -100,7 +101,7 @@ public class ReportServiceImpl implements ReportService {
     @Override
     public String downLoadReport(BaseIdReq req) throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
         RestTemplate restTemplate = getRestTemplateWithoutSANCheck();
-        String reportDeleteUrl = ConstantContextHolder.getScaIp() + "openapi/v1/asset/report/downLoadReport/batch";
+        String reportDeleteUrl = ConstantContextHolder.getScaIp() + "/openapi/v1/asset/report/downLoadReport/batch";
         MultiValueMap<String, Object> body = buildDownloadRequestBody(req);
         HttpHeaders headers = createHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
@@ -133,7 +134,9 @@ public class ReportServiceImpl implements ReportService {
 
     private MultiValueMap<String, Object> buildFindRequestBody(BaseIdPageReq req) {
         MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
-        body.add("projectId", req.getProjectId());
+        if (!ObjectUtils.isEmpty(req.getProjectId())){
+            body.add("projectId", req.getProjectId());
+        }
         body.add("pageNum", req.getPageNo());
         body.add("pageSize", req.getPageSize());
         return body;