修复查询列表为空的时候报错问题

kdyzm · May 17, 2021 · 7383561 · 7383561
1 parent c936bd5
commit 7383561
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java
@@ -110,8 +110,15 @@ public Map<String, Object> pageList(HttpServletRequest request,
 		List<XxlJobLog> list = xxlJobLogDao.pageList(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus);
 		List<Integer> jobGroupIds = list.stream().map(XxlJobLog::getJobGroup).collect(Collectors.toList());
 		List<Integer> jobIds = list.stream().map(XxlJobLog::getJobId).collect(Collectors.toList());
-		List<XxlJobGroup> jobGroups=xxlJobGroupDao.selectByIds(jobGroupIds);
-		List<XxlJobInfo> xxlJobs = xxlJobInfoDao.selectByIds(jobIds);
+		List<XxlJobGroup> jobGroups = new ArrayList<>();
+		if(!CollectionUtils.isEmpty(jobGroupIds)){
+            jobGroups = xxlJobGroupDao.selectByIds(jobGroupIds);	
+		}
+		List<XxlJobInfo> xxlJobs = new ArrayList<>();
+		if(!CollectionUtils.isEmpty(jobIds)){
+            xxlJobs = xxlJobInfoDao.selectByIds(jobIds);	
+		}
+
 		Map<Integer,XxlJobInfo> xxlJobInfoMap = new HashMap<>();
 		Map<Integer,XxlJobGroup> xxlJobGroupMap = new HashMap<>();
 		if(!CollectionUtils.isEmpty(jobGroups)){

diff --git a/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties b/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties
@@ -1,6 +1,6 @@
 admin_name=任务调度中心
 admin_name_full=分布式任务调度平台XXL-JOB
-admin_version=2.3.0
+admin_version=2.4.1
 admin_i18n=
 
 ## system