|
@@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Arrays;
|
|
|
import java.util.Collection;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
@@ -90,16 +91,12 @@ public class TopCourseProjectTypeServiceImpl extends ServiceImpl<TopCourseProjec
|
|
|
TopCourseProjectType update = BeanUtil.toBean(bo, TopCourseProjectType.class);
|
|
|
//判断是否有重复命名
|
|
|
if (bo.getStatus() != -1) {
|
|
|
- TopCourseProjectTypeQueryBo courseProjectTypeQueryBo = new TopCourseProjectTypeQueryBo();
|
|
|
- courseProjectTypeQueryBo.setProjectName(bo.getProjectName());
|
|
|
- courseProjectTypeQueryBo.setEducationId(bo.getEducationId());
|
|
|
- courseProjectTypeQueryBo.setId(bo.getId());
|
|
|
- List<Integer> longs = new ArrayList<>();
|
|
|
- longs.add(1);
|
|
|
- longs.add(0);
|
|
|
- courseProjectTypeQueryBo.setStatus(longs);
|
|
|
- Collection<TopCourseProjectTypeVo> courseProjectTypeVos = baseMapper.queryList(courseProjectTypeQueryBo);
|
|
|
- if (CollectionUtils.isEmpty(courseProjectTypeVos)) {
|
|
|
+ List<TopCourseProjectType> topCourseProjectTypes = baseMapper.selectList(new LambdaQueryWrapper<TopCourseProjectType>()
|
|
|
+ .eq(TopCourseProjectType::getProjectName, bo.getProjectName())
|
|
|
+ .eq(TopCourseProjectType::getEducationId, bo.getEducationId())
|
|
|
+ .eq(TopCourseProjectType::getId, bo.getId())
|
|
|
+ .in(TopCourseProjectType::getStatus, Arrays.asList(0, 1)));
|
|
|
+ if (CollectionUtils.isEmpty(topCourseProjectTypes)) {
|
|
|
validEntityBeforeSave(update);
|
|
|
}
|
|
|
}
|