Merge remote-tracking branch 'origin/master'

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/RegisterParentsStudentServiceImpl.java

@@ -132,6 +132,7 @@ public class RegisterParentsStudentServiceImpl implements IRegisterParentsStuden
         lqw.eq(StringUtils.isNotBlank(bo.getAuditUser()), RegisterParentsStudent::getAuditUser, bo.getAuditUser());
         lqw.eq(StringUtils.isNotBlank(bo.getOpinion()), RegisterParentsStudent::getOpinion, bo.getOpinion());
         lqw.in((bo.getClassIds()!=null && bo.getClassIds().size()>0),RegisterParentsStudent::getClassId, bo.getClassIds());
+        lqw.orderByDesc(RegisterParentsStudent::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/RegisterSchoolServiceImpl.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.system.domain.RegisterParentsStudent;
 import org.dromara.system.domain.RegisterSchoolFile;
 import org.dromara.system.domain.bo.RegisterParentsStudentBo;
 import org.dromara.system.domain.bo.RegisterSchoolFileBo;
@@ -109,6 +110,7 @@ public class RegisterSchoolServiceImpl implements IRegisterSchoolService {
         lqw.eq(bo.getAuditId() != null, RegisterSchool::getAuditId, bo.getAuditId());
         lqw.eq(StringUtils.isNotBlank(bo.getAuditUser()), RegisterSchool::getAuditUser, bo.getAuditUser());
         lqw.eq(StringUtils.isNotBlank(bo.getOpinion()), RegisterSchool::getOpinion, bo.getOpinion());
+        lqw.orderByDesc(RegisterSchool::getCreateTime);
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/RegisterTeacherServiceImpl.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.mybatis.helper.DataPermissionHelper;
+import org.dromara.system.domain.RegisterSchool;
 import org.dromara.system.domain.RegisterTeacherClass;
 import org.dromara.system.domain.SysTenant;
 import org.dromara.system.domain.bo.RegisterSchoolFileBo;
@@ -113,6 +114,7 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
         lqw.eq(bo.getAuditId() != null, RegisterTeacher::getAuditId, bo.getAuditId());
         lqw.eq(StringUtils.isNotBlank(bo.getAuditUser()), RegisterTeacher::getAuditUser, bo.getAuditUser());
         lqw.eq(StringUtils.isNotBlank(bo.getOpinion()), RegisterTeacher::getOpinion, bo.getOpinion());
+        lqw.orderByDesc(RegisterTeacher::getCreateTime);
         return lqw;
     }