|
@@ -283,12 +283,18 @@ public class TrainingDemandServiceImpl implements TrainingDemandService {
|
|
|
// 参与培训的员工
|
|
|
String participateuserid = trainingDemandSurveyDo.getParticipateuserid();
|
|
|
if (StringUtils.isNotBlank(participateuserid)) {
|
|
|
- participantUserIdList.addAll(Arrays.asList(participateuserid.split(",")));
|
|
|
+ String[] userIds = participateuserid.split(",");
|
|
|
+ for (int i = 0; i < userIds.length; i++) {
|
|
|
+ participantUserIdList.add(userIds[i]+"-;-"+trainingDemandSurveyDo.getParticipateusername().split(",")[i]);
|
|
|
+ }
|
|
|
}
|
|
|
// 排除的员工
|
|
|
String excludeuserid = trainingDemandSurveyDo.getExcludeuserid();
|
|
|
if (StringUtils.isNotBlank(excludeuserid)) {
|
|
|
- participantUserIdList.removeAll(Arrays.asList(excludeuserid.split(",")));
|
|
|
+ String[] userIds = excludeuserid.split(",");
|
|
|
+ for (int i = 0; i < userIds.length; i++) {
|
|
|
+ participantUserIdList.remove(userIds[i]+"-;-"+trainingDemandSurveyDo.getExcludeusername().split(",")[i]);
|
|
|
+ }
|
|
|
}
|
|
|
return participantUserIdList;
|
|
|
}
|