|
|
|
@ -225,6 +225,7 @@ public class YysClassesServiceImpl extends ServiceImpl<YysClassesMapper, YysClas
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
yysClassesQueryWrapper.lambda().isNull(YysClassesEntity::getDeleteMark);
|
|
|
|
|
if("0".equals(dataType)){
|
|
|
|
|
if((total>0 && AllIdList.size()>0) || total==0){
|
|
|
|
|
Page<YysClassesEntity> page=new Page<>(yysClassesPagination.getCurrentPage(), yysClassesPagination.getPageSize());
|
|
|
|
@ -255,7 +256,9 @@ public class YysClassesServiceImpl extends ServiceImpl<YysClassesMapper, YysClas
|
|
|
|
|
@Override
|
|
|
|
|
public void delete(YysClassesEntity entity){
|
|
|
|
|
if(entity!=null){
|
|
|
|
|
this.removeById(entity.getId());
|
|
|
|
|
entity.setDeleteMark(1);
|
|
|
|
|
entity.setDeleteTime(DateUtil.getNowDate());
|
|
|
|
|
this.updateById(entity);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
|
|
|
|
@ -290,8 +293,12 @@ public class YysClassesServiceImpl extends ServiceImpl<YysClassesMapper, YysClas
|
|
|
|
|
|
|
|
|
|
if(isSave){
|
|
|
|
|
String mainId = RandomUtil.uuId() ;
|
|
|
|
|
entity.setCreatorTime(DateUtil.getNowDate());
|
|
|
|
|
entity.setCreatorUserId(userInfo.getUserId());
|
|
|
|
|
entity.setId(mainId);
|
|
|
|
|
}else{
|
|
|
|
|
entity.setLastModifyTime(DateUtil.getNowDate());
|
|
|
|
|
entity.setLastModifyUserId(userInfo.getUserId());
|
|
|
|
|
}
|
|
|
|
|
this.saveOrUpdate(entity);
|
|
|
|
|
|
|
|
|
|