diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MachineVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MachineVo.java
index f13d357c..8cdd489a 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MachineVo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MachineVo.java
@@ -25,13 +25,13 @@ public class MachineVo extends Machine {
     private String materialModel;
 
     @ApiModelProperty("库管员id")
-    private Long keeperId;
+    private String keeperId;
 
     @ApiModelProperty("库管员名称")
     private String keeperName;
 
     @ApiModelProperty("维修员id")
-    private Long repairId;
+    private String repairId;
 
     @ApiModelProperty("维修员名称")
     private String repairName;
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
index dac66b2f..7f7c35c3 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
@@ -158,8 +158,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ma.inspect_man as inspectMan,
             ma.inspect_status as inspectStatus,
             ma.phone as phone,
-            GROUP_CONCAT( DISTINCT su1.nick_name ORDER BY su1.nick_name SEPARATOR ', ' ) AS keeperName,
-            GROUP_CONCAT( DISTINCT su2.nick_name ORDER BY su2.nick_name SEPARATOR ', ' ) AS repairName,
+            GROUP_CONCAT( DISTINCT su1.user_id ORDER BY su1.user_id SEPARATOR ', ' ) AS keeperId,
+            GROUP_CONCAT( DISTINCT su1.nick_name ORDER BY su1.user_id SEPARATOR ', ' ) AS keeperName,
+            GROUP_CONCAT( DISTINCT su2.user_id ORDER BY su2.user_id SEPARATOR ', ' ) AS repairId,
+            GROUP_CONCAT( DISTINCT su2.nick_name ORDER BY su2.user_id SEPARATOR ', ' ) AS repairName,
             baa.asset_name as assetName,
             ma.assets_id as assetsId,
             ma.remark as remark