From f766d1ae97e523268b4199c10ad1a296839c5e72 Mon Sep 17 00:00:00 2001
From: csyue <1203338439@qq.com>
Date: Mon, 27 May 2024 20:45:12 +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

---
 .../sgzb/app/service/impl/TmTaskServiceImpl.java   | 14 +++++++++++---
 .../src/main/resources/mapper/app/TmTaskMapper.xml |  3 +++
 2 files changed, 14 insertions(+), 3 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 68ce334b..505f1e27 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
@@ -618,12 +618,15 @@ public class TmTaskServiceImpl implements TmTaskService {
     public List<TmTask> getLeaseAuditManageList(TmTask record) {
         Set<String> roles = SecurityUtils.getLoginUser().getRoles();
         Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
-        if (roles.contains("fgs")) {
+        List<TmTask> tmTaskList = new ArrayList<>();
+        if (roles.contains("fgs") && roles.contains("sgb")) {
+            record.setCompanyId(101);
+            tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
+        } else if (roles.contains("fgs")) {
             record.setDeptId(deptId);
+            tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
         }
-        List<TmTask> tmTaskList = tmTaskMapper.getAuditManageListByLeaseTmTask(record);
         Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
-
         for (TmTask tmTask : tmTaskList) {
             int count = 0;
             if (tmTask != null) {
@@ -651,6 +654,11 @@ public class TmTaskServiceImpl implements TmTaskService {
                             }
                         }
                     }
+                    // 存入领料任务实体集合
+                    tmTask.setLeaseApplyInfoList(collect);
+                    if (collect.size() > 0) {
+                        tmTask.setRemark(collect.get(0).getRemark());
+                    }
                 }
                 //施管部只能看到机具分公司（101）的数据
                 if (roles.contains("jjfgs") || roles.contains("sgb") || deptId == 101) {
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 135e74c5..30212702 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
@@ -561,6 +561,9 @@
       <if test="record.deptId != null and record.deptId != '' ">
           AND su.dept_id = #{record.deptId}
       </if>
+      <if test="record.companyId != null ">
+        AND lai.company_id = #{record.companyId}
+      </if>
       <if test="record.taskId != null and record.taskId != '' ">
           AND tt.task_id = #{record.taskId}
       </if>