From 62084735c1f5d6b6d4771aadf4d9241479a4d4ee Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 24 Oct 2022 15:06:16 +0800
Subject: [PATCH] 用户查询增加模糊查询；修复当编辑用户时账号解封的问题；全景管理查询未删除的数据；当性别，生日未填时数据库同时也录入数据
---
src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml b/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
index ea64b8d..a163d77 100644
--- a/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
+++ b/src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
@@ -96,14 +96,12 @@
<select id="statisticsStock" resultType="java.lang.Double">
SELECT SUM(inv.product_inventory_num) as sum
FROM sys_process_inv inv
- LEFT JOIN sys_farm_product_stock sfps ON sfps.id = inv.fps_id
- LEFT JOIN sys_land land ON land.id = sfps.land_id
WHERE 1=1 AND inv.is_deleted = 0
<if test="year!=null and year!=''">
and YEAR ( inv.create_time ) = #{year}
</if>
<if test="farmId!=null and farmId!=''">
- and land.farm_id = #{farmId}
+ and inv.fps_id = #{farmId}
</if>
</select>
<select id="selectByFarmIdProductId" resultType="org.springblade.modules.processInv.entity.ProcessInv">
--
Gitblit v1.9.3