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