Merge remote-tracking branch 'origin/master'

许鹏程

2024-08-28 d98c519d9b22bb7b090830ea68735b75bbb33849

 src/main/java/com/product/file/service/DocumentService.java

@@ -668,7 +668,14 @@
    public DataTableEntity getApplyUserSort() throws BaseException {
        StringBuilder sb=new StringBuilder();
        List<String> param=new ArrayList<>();
        sb.append(" SELECT a.borrower,a.show_name,a.applayCount,a.applayFileCount ");
        sb.append(" SELECT b.*,a.applayCount ");
        sb.append(" FROM (");
        sb.append(" SELECT borrower,count(borrower) as applayCount");
        sb.append(" FROM product_oa_document_borrow ");
        sb.append(" group by borrower");
        sb.append(" ) a LEFT JOIN ");
        sb.append(" (");
        sb.append(" SELECT a.borrower,a.show_name,a.applayFileCount ");
        sb.append(" FROM (");
        sb.append(" SELECT w.borrower,s.show_name,");
        sb.append(" count( borrower )  AS applayCount,");
@@ -681,8 +688,9 @@
        sb.append(" left JOIN product_sys_staffs s");
        sb.append(" on w.borrower=s.user_id");
        sb.append(" GROUP BY w.borrower,s.show_name");
        sb.append(" )a");
        sb.append(" order by a.applayCount,a.applayFileCount asc");
        sb.append(" )a )b");
        sb.append(" on a.borrower=b.borrower ");
        sb.append(" order by a.applayCount,b.applayFileCount asc");
        DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(),param.toArray());
        return dataTableEntity;
    }