diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java
index 536e3e5..df21a0a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java
@@ -1035,4 +1035,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
 
     @ApiModelProperty("是否报废（默认0不报废 2代表报废）")
     private String isbf;
+
+    @ApiModelProperty("报废原因")
+    private String bfyy;
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml
index fa37a2f..e5d2696 100644
--- a/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml
@@ -48,7 +48,7 @@
         l.*
         FROM
         asset_current a
-        LEFT JOIN ( SELECT asset_id, NAME, tyshxydm, lxr, lxdh, gyszcdz, sfwtc FROM asset_supply_chain WHERE type = 5 GROUP BY asset_id ) b ON a.id = b.asset_id
+        LEFT JOIN ( SELECT asset_id, NAME, tyshxydm, lxr, lxdh, gyszcdz, sfwtc FROM asset_supply_chain WHERE type = 5 GROUP BY asset_id,NAME, tyshxydm, lxr, lxdh, gyszcdz, sfwtc ) b ON a.id = b.asset_id
         LEFT JOIN (
         SELECT
         asset_id,
@@ -63,7 +63,13 @@
         WHERE
         type = 7
         GROUP BY
-        asset_id
+        asset_id,
+        NAME,
+        tyshxydm,
+        lxr,
+        lxdh,
+        gyszcdz,
+        sfwtc
         ) c ON a.id = c.asset_id
         LEFT JOIN (
         SELECT
@@ -83,7 +89,11 @@
         WHERE
         type = 1
         GROUP BY
-        asset_id
+        asset_id,
+        sblx,
+        pp,
+        sb_ip,
+        czxt,czxtbb,yjxh,yjxlh,yjbbxx,yjyt,yjbsxx
         ) d ON a.id = d.asset_id
         LEFT JOIN (
         SELECT
@@ -101,11 +111,13 @@
         WHERE
         type = 2
         GROUP BY
-        asset_id
+        asset_id,
+        sblx,
+        pp,sb_ip,yjxh,yjxlh,yjbbxx,yjyt,yjbsxx
         ) e ON a.id = e.asset_id
         LEFT JOIN ( SELECT
                         asset_id, sblx AS aqwlsblx, pp AS aqwlpp, sb_ip AS aqwlsbIp
-                    FROM asset_basic_network WHERE type = 3 GROUP BY asset_id ) l ON a.id = l.asset_id
+                    FROM asset_basic_network WHERE type = 3 GROUP BY asset_id,sblx,pp,sb_ip ) l ON a.id = l.asset_id
         <where>
             a.del_flag = '0' and a.isbf = '0'
             <if test="req.xtmc!=null and req.xtmc!='' ">