|
@@ -326,13 +326,14 @@ public class ProjectImpl implements ProjectService {
|
|
|
|
|
|
|
|
if(projectFilterVo.getFilterType()==0||projectFilterVo.getFilterType()==1){
|
|
if(projectFilterVo.getFilterType()==0||projectFilterVo.getFilterType()==1){
|
|
|
projectCount = projectMapper.getSearchProjectCount(projectFilterVo);
|
|
projectCount = projectMapper.getSearchProjectCount(projectFilterVo);
|
|
|
- }else if(projectFilterVo.getFilterType()==0||projectFilterVo.getFilterType()==2) {
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+ if(projectFilterVo.getFilterType()==0||projectFilterVo.getFilterType()==2) {
|
|
|
attachmentCount = projectMapper.getSearchAttachmentCount(projectFilterVo);
|
|
attachmentCount = projectMapper.getSearchAttachmentCount(projectFilterVo);
|
|
|
- } else if (projectFilterVo.getFilterType()==0||projectFilterVo.getFilterType()==3) {
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+ if (projectFilterVo.getFilterType()==0||projectFilterVo.getFilterType()==3) {
|
|
|
graphicLayerCount = projectMapper.getSearchGraphicLayerCount(projectFilterVo);
|
|
graphicLayerCount = projectMapper.getSearchGraphicLayerCount(projectFilterVo);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
// 根据项目id查询所有流程id
|
|
// 根据项目id查询所有流程id
|
|
|
//List<String> projectIdList = projects.stream().map(BaseId::getId).collect(Collectors.toList());
|
|
//List<String> projectIdList = projects.stream().map(BaseId::getId).collect(Collectors.toList());
|
|
|
// List<ProjectWorkflow> projectWorkflowList = null;
|
|
// List<ProjectWorkflow> projectWorkflowList = null;
|