试验-规范管理-规范文件管理-列表查询文件

blade-service/blade-business/src/main/java/org/springblade/business/controller/PrivateStandardController.java

@@ -54,10 +54,18 @@ public class PrivateStandardController {
      */
     @GetMapping("page")
     @ApiOperation(value = "分页查询所有数据", notes = "传入分页对象和高级查询对象")
-    public R<IPage<PrivateStandard>> selectAll(Query query, PrivateStandard privateStandard) {
+    public R<IPage<PrivateStandardDTO>> selectAll(Query query, PrivateStandard privateStandard) {
         try {
             Page page = new Page(query.getCurrent(), query.getSize());
-            IPage<PrivateStandard> resultPage = this.privateStandardService.page(page, new QueryWrapper<>(privateStandard));
+            IPage<PrivateStandardDTO> resultPage = this.privateStandardService.page(page, new QueryWrapper<>(privateStandard));
+            if(privateStandard.getType() != null && privateStandard.getType() == 2){
+                for (PrivateStandardDTO record : resultPage.getRecords()) {
+                    List<StandardFile> list = standardFileService.list(Wrappers.<StandardFile>lambdaQuery()
+                            .eq(StandardFile::getStandardId, record.getId())
+                            .eq(StandardFile::getIsDeleted, 0));
+                    record.setStandardFiles(list);
+                }
+            }
             return R.data(resultPage);
         } catch (Exception e) {
             // 可根据实际需求记录日志或返回特定错误信息
@@ -80,6 +88,7 @@ public class PrivateStandardController {
         List<StandardFile> list = standardFileService.list(Wrappers.<StandardFile>lambdaQuery()
                 .eq(StandardFile::getStandardId, id)
                 .eq(StandardFile::getIsDeleted, 0));
+
         PrivateStandardDTO privateStandardDTO = BeanUtil.copyProperties(byId, PrivateStandardDTO.class);
         privateStandardDTO.setStandardFiles(list);
         return R.data(privateStandardDTO);