From a0980a162df8da2f360bedff76aac5c13c26ecb5 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Thu, 13 Oct 2022 15:55:27 +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            | 9 +++++----
 src/main/resources/mapper/taskmanage/TaskDatailDao.xml | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/oss/SysOssDao.xml b/src/main/resources/mapper/oss/SysOssDao.xml
index 66bf4a2..95381b8 100644
--- a/src/main/resources/mapper/oss/SysOssDao.xml
+++ b/src/main/resources/mapper/oss/SysOssDao.xml
@@ -25,11 +25,12 @@
             <if test="orderRef1 != null and orderRef1!= ''">
                 and order_ref1 = #{orderRef1}
             </if>
-            <if test="orderRef2 != null and orderRef2!= ''">
-                or ( order_ref2 = #{orderRef2} AND order_ref1 = #{orderRef1})
+
+            <if test=" orderRef2 != null and orderRef2!= '' and orderRef3 != null and orderRef3!= ''">
+                and ( order_ref2 = #{orderRef2} or order_ref1 = #{orderRef3})
             </if>
-            <if test="orderRef3 != null and orderRef3!= ''">
-                AND order_ref3 = #{orderRef3}
+            <if test="orderRef1 == null or orderRef1 == '' and  orderRef3 != null and orderRef3!= ''">
+                and order_ref3 = #{orderRef3}
             </if>
         </where>
         order by create_date
diff --git a/src/main/resources/mapper/taskmanage/TaskDatailDao.xml b/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
index 88c8cea..bc095b7 100644
--- a/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
+++ b/src/main/resources/mapper/taskmanage/TaskDatailDao.xml
@@ -30,7 +30,7 @@
         , tl.updated_date
         , tl.updated_by
         , tl.task_header
-        , td.responsible_person
+        , u.username responsible_person
         ,( td.department + ' | ' +  u.username) as dep_user_name
         , td.task_id
         from task_detail td