feat: 2.6.0
1. 修复组查询问题
This commit is contained in:
		
							parent
							
								
									e8bb418382
								
							
						
					
					
						commit
						54dd749efc
					
				@ -181,7 +181,7 @@ public class ScanJobTaskActor extends AbstractActor {
 | 
				
			|||||||
            List<String> groupConfigs = groupConfigMapper.selectList(new LambdaQueryWrapper<GroupConfig>()
 | 
					            List<String> groupConfigs = groupConfigMapper.selectList(new LambdaQueryWrapper<GroupConfig>()
 | 
				
			||||||
                    .select(GroupConfig::getGroupName)
 | 
					                    .select(GroupConfig::getGroupName)
 | 
				
			||||||
                    .eq(GroupConfig::getGroupStatus, StatusEnum.YES.getStatus())
 | 
					                    .eq(GroupConfig::getGroupStatus, StatusEnum.YES.getStatus())
 | 
				
			||||||
                    .eq(GroupConfig::getGroupName, jobs.stream().map(Job::getGroupName).collect(Collectors.toList())))
 | 
					                    .in(GroupConfig::getGroupName, jobs.stream().map(Job::getGroupName).collect(Collectors.toList())))
 | 
				
			||||||
                .stream().map(GroupConfig::getGroupName).collect(Collectors.toList());
 | 
					                .stream().map(GroupConfig::getGroupName).collect(Collectors.toList());
 | 
				
			||||||
            jobs = jobs.stream().filter(job -> groupConfigs.contains(job.getGroupName())).collect(Collectors.toList());
 | 
					            jobs = jobs.stream().filter(job -> groupConfigs.contains(job.getGroupName())).collect(Collectors.toList());
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
				
			|||||||
@ -144,7 +144,7 @@ public class ScanWorkflowTaskActor extends AbstractActor {
 | 
				
			|||||||
            List<String> groupConfigs = groupConfigMapper.selectList(new LambdaQueryWrapper<GroupConfig>()
 | 
					            List<String> groupConfigs = groupConfigMapper.selectList(new LambdaQueryWrapper<GroupConfig>()
 | 
				
			||||||
                    .select(GroupConfig::getGroupName)
 | 
					                    .select(GroupConfig::getGroupName)
 | 
				
			||||||
                    .eq(GroupConfig::getGroupStatus, StatusEnum.YES.getStatus())
 | 
					                    .eq(GroupConfig::getGroupStatus, StatusEnum.YES.getStatus())
 | 
				
			||||||
                    .eq(GroupConfig::getGroupName, workflows.stream().map(Workflow::getGroupName).collect(Collectors.toList())))
 | 
					                    .in(GroupConfig::getGroupName, workflows.stream().map(Workflow::getGroupName).collect(Collectors.toList())))
 | 
				
			||||||
                .stream().map(GroupConfig::getGroupName).collect(Collectors.toList());
 | 
					                .stream().map(GroupConfig::getGroupName).collect(Collectors.toList());
 | 
				
			||||||
            workflows = workflows.stream().filter(workflow -> groupConfigs.contains(workflow.getGroupName())).collect(Collectors.toList());
 | 
					            workflows = workflows.stream().filter(workflow -> groupConfigs.contains(workflow.getGroupName())).collect(Collectors.toList());
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user