From 5aa07d22c04bdfc3f5d6b9648bb7132b25bac849 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 15 Jun 2022 15:37:03 +0800
Subject: [PATCH] 农资库存管理

---
 src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
index 57558d9..2049187 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -90,26 +90,38 @@
     <select id="selectZAre" resultType="java.util.HashMap">
         SELECT IFNULL(land_area, 0) as area, IFNULL(land_unit, 0) as unit
         FROM sys_land
-        WHERE is_deleted = 0 and  dept_id=#{deprId}
+        WHERE is_deleted = 0
+        <if test="deptId!= null and deptId!=''">
+            and dept_id=#{deptId}
+        </if>
     </select>
     <!--土地使用面积-->
     <select id="selectSAre" resultType="java.util.HashMap">
         SELECT IFNULL(land_area, 0) as area, IFNULL(land_unit, 0) as unit
         FROM sys_land
         WHERE is_deleted = 0
-          and type = 0 and  dept_id=#{deprId}
+        and type = 0
+        <if test="deptId!= null and deptId!=''">
+            and dept_id=#{deptId}
+        </if>
     </select>
     <!--土地未使用面积-->
     <select id="selectWAre" resultType="java.util.HashMap">
         SELECT IFNULL(land_area, 0) as area, IFNULL(land_unit, 0) as unit
         FROM sys_land
         WHERE is_deleted = 0
-          and type = 1 and  dept_id=#{deprId}
+        and type = 1
+        <if test="deptId!= null and deptId!=''">
+            and dept_id=#{deptId}
+        </if>
     </select>
     <select id="selectNum" resultType="java.util.HashMap">
         SELECT strain_id
         FROM `sys_farm_plant`
-        WHERE status = 1 and dept_id=#{deprId}
+        WHERE status = 1
+        <if test="deptId!= null and deptId!=''">
+            and dept_id=#{deptId}
+        </if>
         GROUP BY strain_id
     </select>
 

--
Gitblit v1.9.3