|  | @@ -35,7 +35,6 @@ import com.xunmei.core.edu.mapper.CoreEduTrainingPlanMapper;
 | 
											
												
													
														|  |  import com.xunmei.core.edu.mapper.CoreEduTrainingTaskMapper;
 |  |  import com.xunmei.core.edu.mapper.CoreEduTrainingTaskMapper;
 | 
											
												
													
														|  |  import com.xunmei.core.edu.mapper.CoreEduTrainingTaskToRoleMapper;
 |  |  import com.xunmei.core.edu.mapper.CoreEduTrainingTaskToRoleMapper;
 | 
											
												
													
														|  |  import com.xunmei.core.edu.mapper.CoreEduTrainingTaskToUserMapper;
 |  |  import com.xunmei.core.edu.mapper.CoreEduTrainingTaskToUserMapper;
 | 
											
												
													
														|  | -import com.xunmei.core.edu.service.ICoreEduTrainingPlanService;
 |  | 
 | 
											
												
													
														|  |  import com.xunmei.core.edu.service.ICoreEduTrainingTaskService;
 |  |  import com.xunmei.core.edu.service.ICoreEduTrainingTaskService;
 | 
											
												
													
														|  |  import com.xunmei.core.edu.service.ICoreEduTrainingTaskToRoleService;
 |  |  import com.xunmei.core.edu.service.ICoreEduTrainingTaskToRoleService;
 | 
											
												
													
														|  |  import com.xunmei.core.edu.service.ICoreEduTrainingTaskToUserService;
 |  |  import com.xunmei.core.edu.service.ICoreEduTrainingTaskToUserService;
 | 
											
										
											
												
													
														|  | @@ -46,7 +45,6 @@ import com.xunmei.system.api.domain.SysUser;
 | 
											
												
													
														|  |  import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 |  |  import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 | 
											
												
													
														|  |  import io.netty.util.internal.StringUtil;
 |  |  import io.netty.util.internal.StringUtil;
 | 
											
												
													
														|  |  import org.apache.commons.lang3.StringUtils;
 |  |  import org.apache.commons.lang3.StringUtils;
 | 
											
												
													
														|  | -import org.springframework.beans.BeanUtils;
 |  | 
 | 
											
												
													
														|  |  import org.springframework.beans.factory.annotation.Autowired;
 |  |  import org.springframework.beans.factory.annotation.Autowired;
 | 
											
												
													
														|  |  import org.springframework.stereotype.Service;
 |  |  import org.springframework.stereotype.Service;
 | 
											
												
													
														|  |  import org.springframework.transaction.annotation.Propagation;
 |  |  import org.springframework.transaction.annotation.Propagation;
 | 
											
										
											
												
													
														|  | @@ -209,12 +207,16 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
 | 
											
												
													
														|  |      public int updateCoreEduTrainingTask(CoreEduTrainingTaskEditDto request) {
 |  |      public int updateCoreEduTrainingTask(CoreEduTrainingTaskEditDto request) {
 | 
											
												
													
														|  |          CoreEduTrainingTask coreEduTrainingTask = coreEduTrainingTaskMapper.selectById(request.getId());
 |  |          CoreEduTrainingTask coreEduTrainingTask = coreEduTrainingTaskMapper.selectById(request.getId());
 | 
											
												
													
														|  |          taskToUserMapper.deleteByMap(MapUtil.of("edu_training_task_id", request.getId()));
 |  |          taskToUserMapper.deleteByMap(MapUtil.of("edu_training_task_id", request.getId()));
 | 
											
												
													
														|  | -        BeanUtils.copyProperties(request, coreEduTrainingTask);
 |  | 
 | 
											
												
													
														|  | 
 |  | +        coreEduTrainingTask.setType(request.getType());
 | 
											
												
													
														|  | 
 |  | +        coreEduTrainingTask.setTrainingStartDateTime(request.getTrainingStartDateTime());
 | 
											
												
													
														|  | 
 |  | +        coreEduTrainingTask.setTrainingEndDateTime(request.getTrainingEndDateTime());
 | 
											
												
													
														|  | 
 |  | +        coreEduTrainingTask.setContent(request.getContent());
 | 
											
												
													
														|  | 
 |  | +        coreEduTrainingTask.setNote(request.getNote());
 | 
											
												
													
														|  |          coreEduTrainingTask.setRecorderId(SecurityUtils.getUserId());
 |  |          coreEduTrainingTask.setRecorderId(SecurityUtils.getUserId());
 | 
											
												
													
														|  |          //主持人默认取网点负责人,具体还没落实,暂时处理成这样   TODO
 |  |          //主持人默认取网点负责人,具体还没落实,暂时处理成这样   TODO
 | 
											
												
													
														|  |          coreEduTrainingTask.setHostId(SecurityUtils.getUserId());
 |  |          coreEduTrainingTask.setHostId(SecurityUtils.getUserId());
 | 
											
												
													
														|  |          List<CoreEduTrainingTaskToUser> taskUserList = request.getTaskUserList();
 |  |          List<CoreEduTrainingTaskToUser> taskUserList = request.getTaskUserList();
 | 
											
												
													
														|  | -        if (taskUserList != null && taskUserList.size() > 0) {
 |  | 
 | 
											
												
													
														|  | 
 |  | +        if (ObjectUtil.isNotEmpty(taskUserList)) {
 | 
											
												
													
														|  |              for (CoreEduTrainingTaskToUser taskToUser : taskUserList) {
 |  |              for (CoreEduTrainingTaskToUser taskToUser : taskUserList) {
 | 
											
												
													
														|  |                  taskToUser.setEduTrainingTaskId(request.getId());
 |  |                  taskToUser.setEduTrainingTaskId(request.getId());
 | 
											
												
													
														|  |                  taskToUser.setSign(0);
 |  |                  taskToUser.setSign(0);
 |