|
@@ -231,13 +231,13 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
|
|
add.setCreateTime(DateUtils.getNowTime());
|
|
add.setCreateTime(DateUtils.getNowTime());
|
|
add.setUpdateTime(DateUtils.getNowTime());
|
|
add.setUpdateTime(DateUtils.getNowTime());
|
|
add.setGradeCode(ServletUtils.getEncoded("BJ"));
|
|
add.setGradeCode(ServletUtils.getEncoded("BJ"));
|
|
- LambdaQueryWrapper<ClassGrade> lqw = Wrappers.lambdaQuery();
|
|
|
|
|
|
+ /*LambdaQueryWrapper<ClassGrade> lqw = Wrappers.lambdaQuery();
|
|
lqw.eq(ClassGrade::getClassName, add.getClassName());
|
|
lqw.eq(ClassGrade::getClassName, add.getClassName());
|
|
lqw.eq(ClassGrade::getStatus, 1);
|
|
lqw.eq(ClassGrade::getStatus, 1);
|
|
List<ClassGrade> list = this.list(lqw);
|
|
List<ClassGrade> list = this.list(lqw);
|
|
if (CollectionUtils.isNotEmpty(list)) {
|
|
if (CollectionUtils.isNotEmpty(list)) {
|
|
throw new RuntimeException("班级名称不能重复");
|
|
throw new RuntimeException("班级名称不能重复");
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
//企业ID
|
|
//企业ID
|
|
String tenant = ServletUtils.getRequest().getHeader("TenantId");
|
|
String tenant = ServletUtils.getRequest().getHeader("TenantId");
|
|
SysOldOrg org = sysOldOrgService.list(new LambdaQueryWrapper<SysOldOrg>()
|
|
SysOldOrg org = sysOldOrgService.list(new LambdaQueryWrapper<SysOldOrg>()
|
|
@@ -428,7 +428,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
|
|
}
|
|
}
|
|
|
|
|
|
if (bo.getStatus() != -1) {
|
|
if (bo.getStatus() != -1) {
|
|
- LambdaQueryWrapper<ClassGrade> lqw = Wrappers.lambdaQuery();
|
|
|
|
|
|
+ /* LambdaQueryWrapper<ClassGrade> lqw = Wrappers.lambdaQuery();
|
|
lqw.eq(ClassGrade::getClassName, update.getClassName());
|
|
lqw.eq(ClassGrade::getClassName, update.getClassName());
|
|
lqw.eq(ClassGrade::getStatus, 1);
|
|
lqw.eq(ClassGrade::getStatus, 1);
|
|
lqw.eq(ClassGrade::getGradeId, update.getGradeId());
|
|
lqw.eq(ClassGrade::getGradeId, update.getGradeId());
|
|
@@ -441,7 +441,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
|
|
if (CollectionUtils.isNotEmpty(classList)) {
|
|
if (CollectionUtils.isNotEmpty(classList)) {
|
|
throw new RuntimeException("班级名称不能重复");
|
|
throw new RuntimeException("班级名称不能重复");
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
}
|
|
}
|
|
if (bo.getStatus() == -1) { //删除判断班级是否人数空
|
|
if (bo.getStatus() == -1) { //删除判断班级是否人数空
|
|
ClassGradeUserQueryBo classGradeUserQueryBo = new ClassGradeUserQueryBo();
|
|
ClassGradeUserQueryBo classGradeUserQueryBo = new ClassGradeUserQueryBo();
|