From 2d5e5d7a19c23535184a21ef9dbca13bead00de7 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 Aug 2022 17:59:08 +0800
Subject: [PATCH] 显示根据农场过滤
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 2 +-
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 2 +-
src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml | 6 ++++++
3 files changed, 8 insertions(+), 2 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 27e8aaf..3f13f7b 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -158,7 +158,7 @@
<select id="selectLandList" resultType="java.util.HashMap">
select id, land_name as landName
from sys_land
- where dept_id = #{userid}
+ where farm_id = #{userid}
and is_deleted = 0
</select>
<!--土地总面积-->
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index 393e48d..8d7fca4 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -32,7 +32,7 @@
LEFT JOIN sys_land l ON t.land_id = l.id
LEFT JOIN sys_stockfactory f ON f.id=t.stock_id
LEFT JOIN blade_user u ON u.id=t.task_user
- where t.is_deleted = 0 and t.status=#{task.status}
+ where t.is_deleted = 0
<if test="task.taskUser!=null and task.taskUser!=''">
and t.task_user=#{task.taskUser}
</if>
diff --git a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
index 85b0ff9..0ede23e 100644
--- a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
+++ b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityMapper.xml
@@ -17,6 +17,12 @@
<if test="traceability.tenantId!=null and traceability.tenantId!=''">
and st.tenant_id = #{traceability.tenantId}
</if>
+ <if test="traceability.deptId != null and traceability.deptId != ''">
+ and st.dept_id = #{traceability.deptId}
+ </if>
+ <if test="traceability.bind !=null and traceability.bind !=''">
+ and st.bind = #{traceability.bind}
+ </if>
</select>
<!--自定义查询溯源码分页数据-->
--
Gitblit v1.9.3