From 41813e09e9d744b5731ad5d53a8f94f904783f51 Mon Sep 17 00:00:00 2001
From: csyue <1203338439@qq.com>
Date: Wed, 29 May 2024 16:44:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E9=A1=B9?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java   | 5 ++---
 .../sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
index 222a0ee0..97695723 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
@@ -704,7 +704,7 @@ public class TmTaskServiceImpl implements TmTaskService {
                                 }
                             }
                         }
-                    } else if (deptId == deptId1) {      //其他各分公司可以看到的数据权限
+                    } else if (deptId == deptId1) {      //其他各分公司可以看到的自己部门的数据
                         // 对领料任务集合查询具体详情
                         for (LeaseApplyInfo leaseApplyInfo : collect) {
                             if (leaseApplyInfo != null) {
@@ -764,6 +764,7 @@ public class TmTaskServiceImpl implements TmTaskService {
         return tmTasks;
     }
 
+
     /**
      * 获取审核列表 - App端
      */
@@ -1326,8 +1327,6 @@ public class TmTaskServiceImpl implements TmTaskService {
             List<LeaseApplyInfo> leaseApplyInfoList2 = tmTaskMapper.getLeaseListByLeaseInfo(task);
             tmTask.setLeaseApplyInfoList(leaseApplyInfoList);
 
-           /* List<LeaseApplyInfo> leaseApplyInfos = new ArrayList<>();
-            leaseApplyInfos = ObjectUtil.clone(leaseApplyInfoList);*/
             List<LeaseApplyDetails> listLeaseDetails = new ArrayList<>();
             for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList2) {
                 if (leaseApplyInfo != null) {
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
index d7865e86..642967da 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -615,7 +615,7 @@
         LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
         LEFT JOIN ma_machine mm ON lad.type_id = mm.type_id
     WHERE
-        lad.parennt_id = #{record.id} AND lad.company_id = #{record.companyId}
+        lad.parennt_id = #{record.id}
     GROUP BY
       lad.id
   </select>