Merge remote-tracking branch 'origin/dev'

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -2869,8 +2869,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			formDTO.setOrgId(staffInfo.getAgencyId());
 		}
 		Result<List<CategoryListResultDTO>> listResult = govIssueOpenFeignClient.selectCategoryOneLevelListByCustomerId(tokenDto);
-		if (!listResult.success() && CollectionUtils.isEmpty(listResult.getData())){
-			throw new EpmetException("查询1级分类列表失败...");
+		if (!listResult.success() || CollectionUtils.isEmpty(listResult.getData())){
+			throw new EpmetException("查询1级分类列表失败或者结果集为空...");
 		}
 		List<ProjectCategoryByDateDTO> projectCategoryByDateDTOS = baseDao.selectProjectCategoryByDate(formDTO.getStartDate(),formDTO.getEndDate(), formDTO.getOrgId(), listResult.getData().get(NumConstant.ZERO).getCodeLength());
 		if (CollectionUtils.isEmpty(projectCategoryByDateDTOS)){