|
|
@ -74,7 +74,7 @@ public class ToolServiceImpl implements ToolService { |
|
|
String calendarId = inData.getCalendarId(); |
|
|
String calendarId = inData.getCalendarId(); |
|
|
boolean exportFlag = inData.isExportFlag(); |
|
|
boolean exportFlag = inData.isExportFlag(); |
|
|
//是否查询 |
|
|
//是否查询 |
|
|
if(searchFlag) { |
|
|
|
|
|
|
|
|
if(!searchFlag) { |
|
|
return new ArrayList<>(); |
|
|
return new ArrayList<>(); |
|
|
} |
|
|
} |
|
|
return toolDao.getToolInfoList(site, toolId, toolType, calendarId, pageIndex, pageSize); |
|
|
return toolDao.getToolInfoList(site, toolId, toolType, calendarId, pageIndex, pageSize); |
|
|
@ -88,7 +88,7 @@ public class ToolServiceImpl implements ToolService { |
|
|
String toolId = inData.getToolId(); |
|
|
String toolId = inData.getToolId(); |
|
|
String toolType = inData.getToolType(); |
|
|
String toolType = inData.getToolType(); |
|
|
//是否查询 |
|
|
//是否查询 |
|
|
if(searchFlag) { |
|
|
|
|
|
|
|
|
if(!searchFlag) { |
|
|
return 0; |
|
|
return 0; |
|
|
} |
|
|
} |
|
|
return toolDao.countToolInfoListForPage(site, toolId, toolType); |
|
|
return toolDao.countToolInfoListForPage(site, toolId, toolType); |
|
|
|