diff --git a/ruoyi-asset/src/main/resources/mapper/asset/AmsDisposalOrderMapper.xml b/ruoyi-asset/src/main/resources/mapper/asset/AmsDisposalOrderMapper.xml index 4a7e15c..d0de6be 100644 --- a/ruoyi-asset/src/main/resources/mapper/asset/AmsDisposalOrderMapper.xml +++ b/ruoyi-asset/src/main/resources/mapper/asset/AmsDisposalOrderMapper.xml @@ -261,6 +261,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and asset.category_name like concat('%', #{asset.categoryName}, '%') + + and asset.asset_status = #{asset.assetStatus} + order by asset.asset_id diff --git a/ruoyi-asset/src/main/resources/templates/asset/disposal/selectAsset.html b/ruoyi-asset/src/main/resources/templates/asset/disposal/selectAsset.html index a84023d..36124e5 100644 --- a/ruoyi-asset/src/main/resources/templates/asset/disposal/selectAsset.html +++ b/ruoyi-asset/src/main/resources/templates/asset/disposal/selectAsset.html @@ -13,6 +13,13 @@
  • +
  • + + +
  •  搜索 @@ -34,6 +41,7 @@