From 253f7506649e24f86e2706658a179ad46edb9045 Mon Sep 17 00:00:00 2001
From: aikai <ZZL86tdd>
Date: Wed, 21 Aug 2024 14:16:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=80=9F=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=8D=E5=87=BA=E9=83=A8=E9=97=A8=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/assets/vo/DeptAssetsPageReqVO.java       |  8 +++++++-
 .../resources/mapper/assets/DeptAssetsMapper.xml   | 14 +++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/assets/vo/DeptAssetsPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/assets/vo/DeptAssetsPageReqVO.java
index d574002a..bae6313b 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/assets/vo/DeptAssetsPageReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/assets/vo/DeptAssetsPageReqVO.java
@@ -22,12 +22,18 @@ public class DeptAssetsPageReqVO extends PageParam {
     @Schema(description = "资产id", example = "15660")
     private Long assetsId;
 
+    @Schema(description = "资产类型id", example = "5169")
+    private Long typeId;
+
     @Schema(description = "资产状态 -1无状态 0空闲 1使用中 2维修 3损坏 （资产类型按单件时候有意义）", example = "2")
     private Integer status;
 
     @Schema(description = "库存")
     private Integer stock;
 
+    @Schema(description = "是否过滤库存 0否 1是")
+    private Integer filterStockFlag;
+
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
@@ -35,4 +41,4 @@ public class DeptAssetsPageReqVO extends PageParam {
     @Schema(description = "资产名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "15660")
     @ExcelProperty("资产名称")
     private String assetsName;
-}
\ No newline at end of file
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/assets/DeptAssetsMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/assets/DeptAssetsMapper.xml
index 44cb9d26..ac525277 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/assets/DeptAssetsMapper.xml
+++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/assets/DeptAssetsMapper.xml
@@ -55,6 +55,12 @@
             <if test="vo.deptId != null">
                 and a.dept_id = #{vo.deptId}
             </if>
+            <if test="vo.filterStockFlag != null and vo.filterStockFlag == 1">
+                and a.stock > 0
+            </if>
+            <if test="vo.typeId != null">
+                and b.type_id = #{vo.typeId}
+            </if>
             <if test="vo.assetsId != null">
                 and a.assets_id = #{vo.assetsId}
             </if>
@@ -84,6 +90,12 @@
             <if test="vo.deptId != null">
                 and a.dept_id = #{vo.deptId}
             </if>
+            <if test="vo.filterStockFlag != null and vo.filterStockFlag == 1">
+                and a.stock > 0
+            </if>
+            <if test="vo.typeId != null">
+                and b.type_id = #{vo.typeId}
+            </if>
             <if test="vo.assetsId != null">
                 and a.assets_id = #{vo.assetsId}
             </if>
@@ -95,4 +107,4 @@
             </if>
         </where>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>