fgd 3 nedēļas atpakaļ
vecāks
revīzija
fd6645769f

+ 2 - 0
jy-log/src/main/java/com/jy/log/dao/LogUserOperationDao.java

@@ -1,5 +1,6 @@
 package com.jy.log.dao;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jy.framework.model.base.BaseDao;
 import com.jy.log.mapper.LogUserOperationMapper;
@@ -36,6 +37,7 @@ public class LogUserOperationDao extends BaseDao<LogUserOperationMapper, LogUser
                         luo.businessId.eq(dto.getBusinessId())
                 )
                 .orderBy(
+                        ObjectUtil.isNotNull(dto.getBusinessId()) ? luo.createTime.asc() : luo.auditStatus.asc(),
                         luo.id.desc()
                 )
                 .page(dto.getPage());