|
|
@@ -58,7 +58,7 @@ public class SchoolConfigServiceImpl extends ServiceImpl<SchoolConfigMapper, Sch
|
|
|
|
|
|
@Override
|
|
|
public SchoolConfig saveOrUpdateMessage(SchoolConfig schoolConfig) {
|
|
|
- this.judgeCriteria(schoolConfig);//判断标准是否符合
|
|
|
+ //this.judgeCriteria(schoolConfig);//判断标准是否符合
|
|
|
//查询标准是否存在相同的 存在且主表id为空 或主表id和查询出的id一致 或 不存在 则修改或保存
|
|
|
LambdaQueryWrapper<SchoolConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
lambdaQueryWrapper.eq(SchoolConfig::getIsDeleted,0);
|
|
|
@@ -73,7 +73,7 @@ public class SchoolConfigServiceImpl extends ServiceImpl<SchoolConfigMapper, Sch
|
|
|
lambdaQueryWrapper.isNull(Func.isNull(schoolConfig.getCompileCategory()),SchoolConfig::getCompileCategory);
|
|
|
lambdaQueryWrapper.eq(Func.isNotEmpty(schoolConfig.getClassType()),SchoolConfig::getClassType,schoolConfig.getClassType());
|
|
|
lambdaQueryWrapper.isNull(Func.isNull(schoolConfig.getClassType()),SchoolConfig::getClassType);
|
|
|
- List<SchoolConfig> schoolConfigs = baseMapper.selectList(lambdaQueryWrapper);
|
|
|
+ /* List<SchoolConfig> schoolConfigs = baseMapper.selectList(lambdaQueryWrapper);
|
|
|
if (CollectionUtils.isNotEmpty(schoolConfigs) && schoolConfig.getId() == null){
|
|
|
throw new RuntimeException("标准已存在,请勿重复创建");
|
|
|
}else if (CollectionUtils.isNotEmpty(schoolConfigs) && schoolConfig.getId() != null){
|
|
|
@@ -81,6 +81,12 @@ public class SchoolConfigServiceImpl extends ServiceImpl<SchoolConfigMapper, Sch
|
|
|
if (!collect.contains(schoolConfig.getId())){
|
|
|
throw new RuntimeException("标准已存在,请勿重复创建");
|
|
|
}
|
|
|
+ }*/
|
|
|
+ SchoolConfig config = baseMapper.selectOne(lambdaQueryWrapper);
|
|
|
+ if (config != null && schoolConfig.getId() == null){
|
|
|
+ throw new RuntimeException("标准已存在,请勿重复创建");
|
|
|
+ }else if (config != null && schoolConfig.getId() != null && schoolConfig.getId().longValue() != config.getId().longValue()){
|
|
|
+ throw new RuntimeException("标准已存在,请勿重复创建");
|
|
|
}
|
|
|
if (schoolConfig.getId() == null){
|
|
|
schoolConfig.setTenantId(SecureUtil.getTenantId());
|
lazhaoqian