Merge branch 'prod' into test

sys-api-service/src/main/java/com/xy/service/LogOperateServiceImpl.java

@@ -42,7 +42,7 @@ public class LogOperateServiceImpl implements LogOperateService {
                 .le(LogOperate::getCreateTime, page.getEndCreateTime())
                 .like(LogOperate::getLogContent)
                 .build()
-                .orderByDesc(!Emptys.check(pageBean.getOrders()), LogOperate::getCreateTime);
+                .orderByDesc(LogOperate::getCreateTime);
         EsPageInfo<LogOperate> esPageInfo = logOperateMapper.pageQuery(lambdaEsQueryWrapper, (int) pageBean.getCurrent(), (int) pageBean.getSize());
         PageBean<LogOperateDto.Vo> voPageBean = toPageBean(LogOperateDto.Vo.class, esPageInfo);
         List<LogOperateDto.Vo> records = voPageBean.getRecords();

sys-api-service/src/main/java/com/xy/service/LogSysEventsServiceImpl.java

@@ -5,7 +5,6 @@ import cn.easyes.core.conditions.LambdaEsQueryWrapper;
 import com.xy.dto.LogSysEventsDto;
 import com.xy.entity.LogSysEvents;
 import com.xy.mapper.LogSysEventsMapper;
-import com.xy.utils.Emptys;
 import com.xy.utils.EsQueryWrapper;
 import com.xy.utils.PageBean;
 import com.xy.utils.R;
@@ -34,7 +33,7 @@ public class LogSysEventsServiceImpl implements LogSysEventsService {
                 .le(LogSysEvents::getCreateTime, page.getEndCreateTime())
                 .like(LogSysEvents::getEventDescript)
                 .build()
-                .orderByDesc(!Emptys.check(pageBean.getOrders()), LogSysEvents::getCreateTime);
+                .orderByDesc(LogSysEvents::getCreateTime);
         EsPageInfo<LogSysEvents> esPageInfo = logSysEventsMapper.pageQuery(lambdaEsQueryWrapper, (int) pageBean.getCurrent(), (int) pageBean.getSize());
         return R.ok(toPageBean(LogSysEventsDto.Vo.class, esPageInfo));
     }