From caaa71c17bd141a26f671531101fede22fb229a2 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Thu, 13 Oct 2022 14:41:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=20=202022-?=
=?UTF-8?q?10-13=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/mapper/oss/SysOssDao.xml | 4 ++--
src/main/resources/mapper/taskmanage/TaskDatailDao.xml | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/oss/SysOssDao.xml b/src/main/resources/mapper/oss/SysOssDao.xml
index c3ca0e4..66bf4a2 100644
--- a/src/main/resources/mapper/oss/SysOssDao.xml
+++ b/src/main/resources/mapper/oss/SysOssDao.xml
@@ -26,10 +26,10 @@
and order_ref1 = #{orderRef1}
- or order_ref2 = #{orderRef2}
+ or ( order_ref2 = #{orderRef2} AND order_ref1 = #{orderRef1})
- or order_ref3 = #{orderRef3}
+ AND order_ref3 = #{orderRef3}
order by create_date
diff --git a/src/main/resources/mapper/taskmanage/TaskDatailDao.xml b/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
index 3d1cd48..88c8cea 100644
--- a/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
+++ b/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
@@ -84,10 +84,11 @@
, tl.updated_date
, tl.updated_by
, tl.task_header
- , td.responsible_person
+ , u.username as responsible_person
, td.task_id
from task_detail td
left join task_list tl on td.task_id = tl.id AND td.site = tl.site
+ left join users u on td.site = u.site and u.userId = td.responsible_person
td.site = #{site}