培训计划

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanTrainingServiceImpl.java

@@ -94,35 +94,15 @@ public class PlanTrainingServiceImpl extends ServiceImpl<PlanTrainingMapper, Pla
 		if (save) {
 			Integer planId = cama.getId();
 			//todo 培训关联表对象  ==>plant + 基本用户信息
-			//拆分用户id
-			String userIds = query.getUserIds();
-			String[] split = userIds.split("、");
 			List<PlanPeople> batchAdd = new ArrayList<>();
-			//为每个用户id创建关联表信息s
-			for (String userId : split) {
-				Integer id = Integer.parseInt(userId);
-				UserVo user = sysUserMapper.getById(id);
-				PlanPeople planPeople = new PlanPeople();
-				planPeople.setPlanId(planId);
-				planPeople.setUserId(user.getId());
-				planPeople.setName(user.getName());
-				planPeople.setAccount(user.getUsername());
-				planPeople.setGroupId(user.getGroupId());
-
-				batchAdd.add(planPeople);
-				cama.setPlanObject(cama.getPlanObject() + user.getName() + "、");
-			}
-
-			//传的GroupIds
-			String groupIds = query.getGroupIds();
-			String[] split1 = groupIds.split("、");
-			List<PlanPeople> batchAdd1 = new ArrayList<>();
-			for (String groupId : split1) {
-				int gpId = Integer.parseInt(groupId);
-				QueryWrapper<SysUser> qw = new QueryWrapper<>();
-				qw.eq("group_id", gpId);
-				List<SysUser> sysUsers = sysUserMapper.selectList(qw);
-				for (SysUser user : sysUsers) {
+			if (query.getUserIds()!=null) {
+				//拆分用户id
+				String userIds = query.getUserIds();
+				String[] split = userIds.split("、");
+				//为每个用户id创建关联表信息s
+				for (String userId : split) {
+					Integer id = Integer.parseInt(userId);
+					UserVo user = sysUserMapper.getById(id);
 					PlanPeople planPeople = new PlanPeople();
 					planPeople.setPlanId(planId);
 					planPeople.setUserId(user.getId());
@@ -131,6 +111,31 @@ public class PlanTrainingServiceImpl extends ServiceImpl<PlanTrainingMapper, Pla
 					planPeople.setGroupId(user.getGroupId());
 
 					batchAdd.add(planPeople);
+					cama.setPlanObject(cama.getPlanObject() + user.getName() + "、");
+				}
+			}
+
+			if (query.getGroupIds()!=null) {
+				//传的GroupIds
+				String groupIds = query.getGroupIds();
+				String[] split1 = groupIds.split("、");
+				List<PlanPeople> batchAdd1 = new ArrayList<>();
+				for (String groupId : split1) {
+					int gpId = Integer.parseInt(groupId);
+					QueryWrapper<SysUser> qw = new QueryWrapper<>();
+					qw.eq("group_id", gpId);
+					List<SysUser> sysUsers = sysUserMapper.selectList(qw);
+					for (SysUser user : sysUsers) {
+						PlanPeople planPeople = new PlanPeople();
+						planPeople.setPlanId(planId);
+						planPeople.setUserId(user.getId());
+						planPeople.setName(user.getName());
+						planPeople.setAccount(user.getUsername());
+						planPeople.setGroupId(user.getGroupId());
+
+						batchAdd.add(planPeople);
+						cama.setPlanObject(cama.getPlanObject() + user.getName() + "、");
+					}
 				}
 			}
 			iPlantPeopleService.saveBatch(batchAdd);