|
@@ -991,14 +991,20 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else if(model.equals("executorId")){
|
|
else if(model.equals("executorId")){
|
|
- StringJoiner stringJoiner = new StringJoiner(",");
|
|
|
|
List<String> taskExecutors = tasKVo.getTaskExecutors();
|
|
List<String> taskExecutors = tasKVo.getTaskExecutors();
|
|
if (taskExecutors!=null&&!taskExecutors.isEmpty()){
|
|
if (taskExecutors!=null&&!taskExecutors.isEmpty()){
|
|
- for (String taskExecutor : taskExecutors) {
|
|
|
|
- stringJoiner.add(taskExecutor);
|
|
|
|
- }
|
|
|
|
|
|
+ String executorString = taskExecutors.stream()
|
|
|
|
+ .map(
|
|
|
|
+ t->{
|
|
|
|
+ if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
|
|
|
|
+ return "$userName="+t+"$";}
|
|
|
|
+ else {return t;}
|
|
|
|
+ }
|
|
|
|
+ ).collect(Collectors.joining(","));
|
|
|
|
+ value =executorString.isEmpty()?"":executorString;
|
|
|
|
+ }else {
|
|
|
|
+ value="";
|
|
}
|
|
}
|
|
- value =stringJoiner.length()==0?"":stringJoiner.toString();
|
|
|
|
}
|
|
}
|
|
else if(model.equals("startDate")){
|
|
else if(model.equals("startDate")){
|
|
if (tasKVo.getStartDate()!=null){
|
|
if (tasKVo.getStartDate()!=null){
|