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}