From beb33397a8d2761d3e87c84351fb756f097e2230 Mon Sep 17 00:00:00 2001
From: "1539530615@qq.com" <1539530615@qq.com>
Date: Fri, 15 Mar 2024 18:00:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/base/RepairMapper.xml          | 5 ++++-
 .../sgzb/material/controller/AgreementInfoController.java    | 3 +--
 .../resources/mapper/material/SecondaryWarehouseMapper.xml   | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
index 048103a5..5ba80a10 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
@@ -201,7 +201,10 @@
                  left join ma_machine mm on mm.ma_id = rad.ma_id
                  left join sys_user su on rad.repairer = su.user_id
                  LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
-        where rad.task_id = #{taskId} and rad.company_id = #{companyId}
+        where rad.task_id = #{taskId}
+        <if test="companyId != null and companyId != ''">
+            and rad.company_id = #{companyId}
+        </if>
         <if test="keyword != null and keyword != ''">
             AND (locate(#{keyword}, mm.ma_code) > 0
             or locate(#{keyword}, su.nick_name) > 0
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/AgreementInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/AgreementInfoController.java
index 154067cb..ec77eeb0 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/AgreementInfoController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/AgreementInfoController.java
@@ -32,8 +32,7 @@ public class AgreementInfoController extends BaseController {
      */
     @ApiOperation(value = "获取协议管理列表")
     @GetMapping("/getAgreementInfoAll")
-    public TableDataInfo getAgreementInfoAll(AgreementInfo bean)
-    {
+    public TableDataInfo getAgreementInfoAll(AgreementInfo bean) {
         startPage();
         List<AgreementInfo> list = agreementInfoService.getAgreementInfoAll(bean);
         return getDataTable(list);
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml
index a3bbba94..106e8f71 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SecondaryWarehouseMapper.xml
@@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by sai.start_time desc
     </select>
     <select id="getRecordsFour" resultType="com.bonus.sgzb.material.domain.TeamLeaseInfo">
-        select tli.team_name as teamName
+        select tli.team_name as teamName,
                mt1.type_name AS typeName,
                mt.type_name AS modelName,
                tli.num,