|
@@ -5,7 +5,6 @@ import com.doc.biz.domain.DocInfo;
|
|
|
import com.doc.biz.domain.DocRecent;
|
|
|
import com.doc.biz.domain.DocSpace;
|
|
|
import com.doc.biz.service.*;
|
|
|
-import com.doc.biz.vo.DocInfoVO;
|
|
|
import com.doc.biz.vo.DocumentVO;
|
|
|
import com.doc.common.annotation.Log;
|
|
|
import com.doc.common.config.EsConfig;
|
|
@@ -17,7 +16,6 @@ import com.doc.common.enums.BusinessType;
|
|
|
import com.doc.common.enums.EventLevel;
|
|
|
import com.doc.common.utils.DateUtils;
|
|
|
import com.doc.common.utils.SecurityUtils;
|
|
|
-import com.doc.common.utils.bean.BeanUtils;
|
|
|
import com.doc.common.utils.file.FileUtils;
|
|
|
import com.doc.common.utils.poi.ExcelUtil;
|
|
|
import io.swagger.annotations.*;
|
|
@@ -272,17 +270,11 @@ public class DocInfoController extends BaseController {
|
|
|
}
|
|
|
startPage();
|
|
|
List<DocInfo> list = docInfoService.selectDocInfoList(docInfo);
|
|
|
- List<DocInfoVO> result = new ArrayList<>();
|
|
|
list.forEach(info -> {
|
|
|
- DocInfoVO vo = new DocInfoVO();
|
|
|
- BeanUtils.copyProperties(info, vo);
|
|
|
-
|
|
|
- vo.setDir(dirMap.get(vo.getDirId()));
|
|
|
- vo.setSpace(spaceMap.get(vo.getSpaceId()));
|
|
|
-
|
|
|
- result.add(vo);
|
|
|
+ info.setDir(dirMap.get(info.getDirId()));
|
|
|
+ info.setSpace(spaceMap.get(info.getSpaceId()));
|
|
|
});
|
|
|
- return getDataTable(result);
|
|
|
+ return getDataTable(list);
|
|
|
}
|
|
|
|
|
|
/**
|