From 29112420e588d1cb925c184a8330a127b0ef57ee Mon Sep 17 00:00:00 2001
From: bns_han <1604366271@qq.com>
Date: Sun, 24 Dec 2023 01:53:20 +0800
Subject: [PATCH] =?UTF-8?q?app-=E9=80=80=E6=96=99=E6=8E=A5=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/app/BackApplyMapper.xml | 9 +++++----
.../src/main/resources/mapper/app/BackReceiveMapper.xml | 5 +++--
.../main/resources/mapper/material/BackApplyMapper.xml | 3 ++-
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
index 43333387..73b4ed01 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
@@ -341,8 +341,8 @@
LEFT JOIN ma_type mt2 ON mt2.type_id=mt1.parent_id
LEFT JOIN ma_type mt3 ON mt3.type_id=mt2.parent_id
LEFT JOIN ma_type mt4 ON mt4.type_id=mt3.parent_id
- WHERE
- bai.company_id=#{companyId}
+# WHERE
+# bai.company_id=#{companyId}
GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time
@@ -451,8 +451,9 @@
LEFT JOIN ma_type mt3 ON mt3.type_id=mt2.parent_id
LEFT JOIN ma_type mt4 ON mt4.type_id=mt3.parent_id
WHERE
- bai.company_id=#{companyId}
- and bad.type_id is not null
+# bai.company_id=#{companyId}
+# and
+ bad.type_id is not null
GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
index ff2c6d16..447ab123 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
@@ -306,7 +306,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt3 ON mt3.type_id=mt2.parent_id
LEFT JOIN ma_type mt4 ON mt4.type_id=mt3.parent_id
WHERE
- bai.company_id=#{companyId}
+ 1=1
+# bai.company_id=#{companyId}
and bai.`code` like concat('%', #{keyWord}, '%') or
bai.back_person like concat('%', #{keyWord}, '%') or