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 varList = outsourcedService.list(page); //列出OutSourced列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; } /**