任务管理 2022-10-13 sxm

src/main/resources/mapper/oss/SysOssDao.xml

@@ -26,10 +26,10 @@
                 and order_ref1 = #{orderRef1}
             </if>
             <if test="orderRef2 != null and orderRef2!= ''">
-                or order_ref2 = #{orderRef2}
+                or ( order_ref2 = #{orderRef2} AND order_ref1 = #{orderRef1})
             </if>
             <if test="orderRef3 != null and orderRef3!= ''">
-                or order_ref3 = #{orderRef3}
+                AND order_ref3 = #{orderRef3}
             </if>
         </where>
         order by create_date

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
         <where>
             td.site = #{site}
             <if test="department != null and department != ''">