gaoluyang
21 小时以前 abd339106ed3a6465293edccd33e5f87bd43bdde
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingDetailedServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -47,13 +47,20 @@
            PersonTrainingDetailed personTrainingDetailed = new PersonTrainingDetailed();
            BeanUtils.copyProperties(i, personTrainingDetailed);
            // 匹配讲师
            User user = userMapper.selectOne(Wrappers.<User>lambdaQuery()
                    .eq(User::getName, i.getTrainingLecturerName()));
            if (ObjectUtils.isEmpty(user)) {
                throw new ErrorException("未找到该讲师:" + i.getTrainingLecturerName());
            // 匹配讲师:系统内唯一匹配的存用户ID;外聘/非系统讲师按姓名文本保存
            if (StringUtils.isBlank(i.getTrainingLecturerName())) {
                throw new ErrorException("培训讲师不能为空");
            }
            personTrainingDetailed.setTrainingLecturerId(user.getId());
            String lecturerName = i.getTrainingLecturerName().trim();
            List<User> lecturers = userMapper.selectList(Wrappers.<User>lambdaQuery()
                    .eq(User::getName, lecturerName));
            if (lecturers.size() == 1) {
                personTrainingDetailed.setTrainingLecturerId(lecturers.get(0).getId());
                personTrainingDetailed.setTrainingLecturerName(null);
            } else {
                personTrainingDetailed.setTrainingLecturerId(null);
                personTrainingDetailed.setTrainingLecturerName(lecturerName);
            }
            personTrainingDetailed.setPlanId(planId);
            personTrainingDetailed.setState(3);