From 5f7f52e93266dc8795ad1543b333a64444c22727 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 28 Sep 2022 11:05:47 +0800
Subject: [PATCH] 修正加工表数据统计结果,取消user,detail接口的访问权限
---
src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
index e30f44e..9a28c0f 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
@@ -173,6 +173,7 @@
sys_sale sale
LEFT JOIN sys_district dis ON sale.sale_destination = dis.CODE
LEFT JOIN sys_land sl ON sl.id = sale.land_id
+ LEFT JOIN sys_process_inv inv ON inv.id = sale.prod_id
WHERE 1 = 1 AND sale.is_deleted = 0
<if test="startTime != null and startTime != ''">
and sale_time >= #{startTime}
@@ -183,9 +184,8 @@
<if test="startTime == null and endTime == null ">
and YEAR ( sale_time ) = YEAR ( NOW( ) )
</if>
-
<if test="farmId != null and farmId != ''">
- and sl.farm_id = #{farmId}
+ and (sl.farm_id = #{farmId} or inv.fps_id = #{farmId})
</if>
GROUP BY
dis.NAME,
--
Gitblit v1.9.3