diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml
index 2a5be55..6732263 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml
@@ -13,11 +13,15 @@
 
     <select id="listPage" resultType="com.casic.missiles.model.MeterFixedAssets">
         SELECT <include refid="Base_Column_List"/>,
-        su.name as usePersonName, sd.full_name as useDeptName
+        su.name as usePersonName, sd.full_name as useDeptName,
+        mse.standard_no AS supportStandardEquipmentNo,
+        mse.standard_name AS supportStandardEquipmentName
         FROM meter_fixed_assets mfa
         LEFT JOIN sys_user su ON su.id = mfa.use_person
         LEFT JOIN sys_dept sd on sd.id = mfa.use_dept
-        WHERE 1=1 and is_del != 1
+        LEFT JOIN meter_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1
+        LEFT JOIN meter_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1
+        WHERE 1=1 and mfa.is_del != 1
         <if test="fixedAssetRequest.id != null">
             and mfa.id = #{fixedAssetRequest.id}
         </if>

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml
index 2a5be55..6732263 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml
@@ -13,11 +13,15 @@
 
     <select id="listPage" resultType="com.casic.missiles.model.MeterFixedAssets">
         SELECT <include refid="Base_Column_List"/>,
-        su.name as usePersonName, sd.full_name as useDeptName
+        su.name as usePersonName, sd.full_name as useDeptName,
+        mse.standard_no AS supportStandardEquipmentNo,
+        mse.standard_name AS supportStandardEquipmentName
         FROM meter_fixed_assets mfa
         LEFT JOIN sys_user su ON su.id = mfa.use_person
         LEFT JOIN sys_dept sd on sd.id = mfa.use_dept
-        WHERE 1=1 and is_del != 1
+        LEFT JOIN meter_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1
+        LEFT JOIN meter_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1
+        WHERE 1=1 and mfa.is_del != 1
         <if test="fixedAssetRequest.id != null">
             and mfa.id = #{fixedAssetRequest.id}
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java
index 611e7fe..cf045cd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java
@@ -284,14 +284,14 @@
      */
     @TableField("mesure_result")
     @DictCodeField(message = "检定结果不合法", cacheName = MeterDictCode.MESURE_RESULT)
-    @ApiModelProperty(value = "有效日期", dataType = "Integer", required = false)
+    @ApiModelProperty(value = "检定结果", dataType = "Integer", required = false)
     private Integer mesureResult;
 
     /**
      * 检定结果名称
      */
     @TableField(exist = false)
-    @ApiModelProperty(value = "有效日期", dataType = "String", required = false)
+    @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false)
     private String mesureResultName;
 
     /**
@@ -557,4 +557,18 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "文件集合", dataType = "List", required = false)
     private List<MeterFixedAssetFile> fileList;
+
+    /**
+     * 所属标准装置编号
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "所属标准装置编号", dataType = "String", required = false)
+    private String supportStandardEquipmentNo;
+
+    /**
+     * 所属标准装置编号
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "所属标准装置名称", dataType = "String", required = false)
+    private String supportStandardEquipmentName;
 }

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml
index 2a5be55..6732263 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterFixedAssetsMapper.xml
@@ -13,11 +13,15 @@
 
     <select id="listPage" resultType="com.casic.missiles.model.MeterFixedAssets">
         SELECT <include refid="Base_Column_List"/>,
-        su.name as usePersonName, sd.full_name as useDeptName
+        su.name as usePersonName, sd.full_name as useDeptName,
+        mse.standard_no AS supportStandardEquipmentNo,
+        mse.standard_name AS supportStandardEquipmentName
         FROM meter_fixed_assets mfa
         LEFT JOIN sys_user su ON su.id = mfa.use_person
         LEFT JOIN sys_dept sd on sd.id = mfa.use_dept
-        WHERE 1=1 and is_del != 1
+        LEFT JOIN meter_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1
+        LEFT JOIN meter_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1
+        WHERE 1=1 and mfa.is_del != 1
         <if test="fixedAssetRequest.id != null">
             and mfa.id = #{fixedAssetRequest.id}
         </if>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java
index 611e7fe..cf045cd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterFixedAssets.java
@@ -284,14 +284,14 @@
      */
     @TableField("mesure_result")
     @DictCodeField(message = "检定结果不合法", cacheName = MeterDictCode.MESURE_RESULT)
-    @ApiModelProperty(value = "有效日期", dataType = "Integer", required = false)
+    @ApiModelProperty(value = "检定结果", dataType = "Integer", required = false)
     private Integer mesureResult;
 
     /**
      * 检定结果名称
      */
     @TableField(exist = false)
-    @ApiModelProperty(value = "有效日期", dataType = "String", required = false)
+    @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false)
     private String mesureResultName;
 
     /**
@@ -557,4 +557,18 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "文件集合", dataType = "List", required = false)
     private List<MeterFixedAssetFile> fileList;
+
+    /**
+     * 所属标准装置编号
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "所属标准装置编号", dataType = "String", required = false)
+    private String supportStandardEquipmentNo;
+
+    /**
+     * 所属标准装置编号
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "所属标准装置名称", dataType = "String", required = false)
+    private String supportStandardEquipmentName;
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java
index b03ad8f..58d29f4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFixedAssetsServiceImpl.java
@@ -3,7 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.FixedAssetRequest;
@@ -99,6 +102,12 @@
     @Override
     @Transactional
     public ReturnDTO addFixedAsset(MeterFixedAssets meterFixedAssets) {
+        if(meterFixedAssets.getCreateUser() == null){
+            AuthUser authUser = ShiroKit.getUser();
+            if(authUser != null){
+                meterFixedAssets.setCreateUser(authUser.getId());
+            }
+        }
         //需要根据出厂编号判重
         validManufacturingNo(meterFixedAssets);
         //生成资产编号
@@ -109,7 +118,7 @@
         meterFixedAssetsMapper.insert(meterFixedAssets);
         // 插入文件列表
         batchSaveFile(meterFixedAssets);
-        return ReturnUtil.success();
+        return ReturnUtil.success(meterFixedAssets.getId());
     }
 
     /**