Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

2022-07-27 17:55:56 +08:00
parent 42b1243419 00f5cf0b5b
commit c7bca27812
8 changed files with 393 additions and 387 deletions
@@ -3411,7 +3411,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
        }
        String fieldStr = fieldSb.substring(0, fieldSb.length() - 1);

-        String field = " osf.id,bdl.serial_number,bdl.title,bdl.title_en,bdl.state,osf.file_name,osf.connect_id," + fieldStr
+        String field = " osf.id,bdl.id as \"buss_document_library_id\",bdl.serial_number,bdl.title,bdl.title_en,bdl.state,osf.file_name,osf.connect_id," + fieldStr
                + " from oss_file osf join buss_document_library bdl" + join.toString();

        //查询条件