From 074cd051923684ddf38b5127e9dedc75d5770385 Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Thu, 6 Jun 2024 16:29:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E5=9B=BE?=
 =?UTF-8?q?=E5=B1=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/keyProjects/OutSourcedController.java     | 2 +-
 .../zcloud/controller/map/MapKeyProjectController.java   | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java
index dc01f969..8df4419e 100644
--- a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java
+++ b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java
@@ -488,7 +488,7 @@ public class OutSourcedController extends BaseController {
         String errInfo = "success";
         PageData pd = new PageData();
         pd = this.getPageData();
-        if (!StringUtils.equals(Jurisdiction.getUsername(), "admin")) {
+        if (!StringUtils.equals(Jurisdiction.getUSER_ID(), "c5187fb9565649a89267f9adf6b0fab6")) {
             if (!StringUtils.equals(Jurisdiction.getCORPINFO_ID(), "1e6dbbe16004402f8d2c0e52afd9a676")
                     && !StringUtils.equals(Jurisdiction.getCORPINFO_ID(), "3a854eefa7894e06aaa1a2611bca80f6")
                     && !StringUtils.equals(Jurisdiction.getCORPINFO_ID(), "020578a4c1f04bc692ee25145c2efbe5")
diff --git a/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java b/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java
index 88f864f1..a766916a 100644
--- a/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java
+++ b/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java
@@ -3,6 +3,7 @@ package com.zcloud.controller.map;
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
+import com.zcloud.service.keyProjects.OutSourcedService;
 import com.zcloud.service.map.MapEightService;
 import com.zcloud.service.map.MapKetProjectService;
 import com.zcloud.util.Jurisdiction;
@@ -31,7 +32,7 @@ public class MapKeyProjectController extends BaseController {
     private MapKetProjectService mapKetProjectService;
 
     @Autowired
-    private MapEightService mapEightService;
+    private OutSourcedService outsourcedService;
 
     @Value("${cfd.prevention.api.url}")
     private String cfdUrl;
@@ -76,7 +77,11 @@ public class MapKeyProjectController extends BaseController {
         pd = this.getPageData();
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业
         page.setPd(pd);
-        return mapKetProjectService.list(page);
+        List<PageData> varList = outsourcedService.list(page);    //列出OutSourced列表
+        map.put("varList", varList);
+        map.put("page", page);
+        map.put("result", errInfo);
+        return map;
     }
 
     /**