From b4c3540fb5d8f02e924fec9e1a0e71c806759f8e Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Mon, 22 Apr 2024 11:19:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E5=AE=A1=E6=A0=B8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
index b65d3113..89e3fd0a 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
@@ -387,17 +387,17 @@ public class TmTaskController extends BaseController {
      * 查询机具领料管理列表
      *
      * @param task    筛选条件
-     * @param souceBy app为1   web为0
+     * @param sourceBy app为1   web为0
      * @return 列表
      */
     @Log(title = "重庆查询机具领料管理列表", businessType = BusinessType.QUERY)
     @GetMapping(value = "getLeaseManageListAllCq")
-    public AjaxResult getLeaseManageListAllCq(TmTask task, Integer souceBy) {
+    public AjaxResult getLeaseManageListAllCq(TmTask task, Integer sourceBy) {
         if (StringUtils.isNull(task)) {
             return AjaxResult.error("参数错误");
         }
         List<TmTask> leaseAuditList;
-        if (souceBy != null && souceBy == 1) {
+        if (sourceBy != null && sourceBy == 1) {
             leaseAuditList = tmTaskService.getLeaseAuditManageListCq(task);
             return AjaxResult.success(leaseAuditList);
         }
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 151df2a8..d8e6a413 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
@@ -635,7 +635,7 @@ public class TmTaskServiceImpl implements TmTaskService {
             if (tmTask != null) {
                 // 去查询任务分单表
                 List<LeaseApplyInfo> collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask);
-                //没有companyId的用户可以看到所有数据
+                //没有companyId的用户或者是分公司账号可以看到所有数据
                 if (companyId == null || roles.contains("fgs")) {
                     // 对领料任务集合查询具体详情
                     for (LeaseApplyInfo leaseApplyInfo : collect) {
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 f4af10c5..fd5e255f 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
@@ -694,6 +694,10 @@
         update_by = #{record.companyAuditBy},
         update_time = now(),
       </if>
+      <if test="record.examineStatusId == 117 and record.examineStatusId == '117'">
+        update_by = #{record.companyAuditBy},
+        update_time = now(),
+      </if>
     </trim>
     WHERE
         task_id = #{record.taskId} and company_id = #{record.companyId}