From 32e81fa68cf76e2331eb88a2299ee0ecd8faa7b3 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 22 Aug 2022 16:53:18 +0800
Subject: [PATCH] 修改为可以卖出全部产品

---
 src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

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 59977ec..98244f2 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -32,13 +32,20 @@
         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>
+        <if test="task.status!=null and task.status!='' or task.status == 0 " >
+            and t.status=#{task.status}
+        </if>
+        <if test="task.farmId!=null and task.farmId!=''">
+            and l.farm_id = #{task.farmId}
         </if>
         <if test="task.User!=null and task.User!=''">
             and t.create_user=#{task.User}
         </if>
+        ORDER BY t.create_time DESC
     </select>
 
     <!--统计待处理任务数量-->

--
Gitblit v1.9.3