|
@@ -495,7 +495,9 @@ public class WmUserSignServiceImpl extends ServiceImpl<WmUserSignMapper, WmUserS
|
|
|
|
|
|
Set<Integer> signIds = signs.stream().map(WmUserSign::getId).collect(Collectors.toSet());
|
|
|
|
|
|
- List<WmTaskContent> taskContents = taskContentService.list(Wrappers.<WmTaskContent>lambdaQuery().in(WmTaskContent::getTemp3, signIds));
|
|
|
+ List<WmTaskContent> taskContents = taskContentService.list(Wrappers.<WmTaskContent>lambdaQuery()
|
|
|
+ .in(WmTaskContent::getTemp3, signIds)
|
|
|
+ .isNull(WmTaskContent::getTemp30));
|
|
|
|
|
|
List<WmTaskContent> availTaskContents = taskContents.stream().filter(con -> StrUtil.isNotBlank(con.getTemp3())).collect(Collectors.toList());
|
|
|
|