Merge branch 'hotfix2' into develop

7 years ago · 4cbbc04a2e
parent 78a80bbf01 45ae8c44ef
commit 4cbbc04a2e
1 changed files with 1 additions and 0 deletions
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TaskManualSettleMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TaskManualSettleMapper.xml
@ -8,5 +8,6 @@
        	task_client_manual_settle s
        left join sys_clients c on s.client_id = c.client_id
        where s.request_time=(select max(B.request_time) from task_client_manual_settle B where s.client_id =B.client_id)
+        and c.manual_settle = 1
    </select>
 </mapper>