任务管理 2022-10-13 sxm

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

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