diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index e02a60f..2384ba7 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -9,6 +9,7 @@
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
 import com.casic.accessControl.user.domain.User;
+import com.casic.accessControl.user.manager.UserManager;
 import com.casic.accessControl.util.*;
 import com.google.gson.Gson;
 import jxl.*;
@@ -55,6 +56,8 @@
     private CsvExportor exportor;
     @Resource
     private OptionItemManager optionItemManager;
+    @Resource
+    private UserManager userInfoManager;
 
     public DataTable<MarkerDto> pageQueryMarker(String params, String markerDto, User user) {
         DataTable<MarkerDto> result = new DataTable<MarkerDto>();
@@ -742,9 +745,11 @@
      * @param outPath  输出路径
      * @return
      */
-    public boolean exportServerExcel(Long companyId,String outPath){
+    public boolean exportServerExcel(Long companyId,Long userId, String outPath){
         List<MarkerDto> markerDtos = null;
-        markerDtos = getAllPointByCompanyId(companyId);
+        User user = userInfoManager.getUserById(userId);
+        markerDtos = getAllPoint(user);
+        //markerDtos = getAllPointByCompanyId(companyId);
         try {
             //打开文件
             WritableWorkbook book = Workbook.createWorkbook(new File(outPath));

diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index e02a60f..2384ba7 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -9,6 +9,7 @@
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
 import com.casic.accessControl.user.domain.User;
+import com.casic.accessControl.user.manager.UserManager;
 import com.casic.accessControl.util.*;
 import com.google.gson.Gson;
 import jxl.*;
@@ -55,6 +56,8 @@
     private CsvExportor exportor;
     @Resource
     private OptionItemManager optionItemManager;
+    @Resource
+    private UserManager userInfoManager;
 
     public DataTable<MarkerDto> pageQueryMarker(String params, String markerDto, User user) {
         DataTable<MarkerDto> result = new DataTable<MarkerDto>();
@@ -742,9 +745,11 @@
      * @param outPath  输出路径
      * @return
      */
-    public boolean exportServerExcel(Long companyId,String outPath){
+    public boolean exportServerExcel(Long companyId,Long userId, String outPath){
         List<MarkerDto> markerDtos = null;
-        markerDtos = getAllPointByCompanyId(companyId);
+        User user = userInfoManager.getUserById(userId);
+        markerDtos = getAllPoint(user);
+        //markerDtos = getAllPointByCompanyId(companyId);
         try {
             //打开文件
             WritableWorkbook book = Workbook.createWorkbook(new File(outPath));
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index 45a4756..41513ff 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -499,10 +499,12 @@
      */
     @RequestMapping("exportMarker")
     @ResponseBody
-    public Map exportMarker(@RequestParam(required = true) Long userId, HttpServletRequest request) {//用户id前端传的companyId
+    public Map exportMarker(@RequestParam(required = true) Long userId,
+                            @RequestParam(required = true) Long companyId,
+                            HttpServletRequest request) {//用户id前端传的companyId
         Map<String, Object> result = new HashMap<String, Object>();
 
-        boolean flag = markerManager.exportServerExcel(userId, request.getServletContext().getRealPath("/") + "/xls/marker" + userId + ".xls");
+        boolean flag = markerManager.exportServerExcel(companyId, userId, request.getServletContext().getRealPath("/") + "/xls/marker" + userId + ".xls");
         if (!flag) {
             result.put("message", "导出失败");
             result.put("success", false);