From 6edba268da4799fa3ebea904dfb21e6bef88ee6d Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 11 三月 2021 11:24:07 +0800
Subject: [PATCH] fix(bug修复): 员工信息列表排序
---
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/SortUtil.java | 8 ++++----
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 7 +++----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/SortUtil.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/SortUtil.java
index f09357c..84f3640 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/SortUtil.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/SortUtil.java
@@ -26,10 +26,10 @@
page.setCurrent(request.getPageNum());
page.setSize(request.getPageSize());
String sortField = request.getField();
- if (camelToUnderscore) {
- sortField = FebsUtil.camelToUnderscore(sortField);
- defaultSort = FebsUtil.camelToUnderscore(defaultSort);
- }
+ // if (camelToUnderscore) {
+ // sortField = FebsUtil.camelToUnderscore(sortField);
+ // defaultSort = FebsUtil.camelToUnderscore(defaultSort);
+ // }
if (StringUtils.isNotBlank(request.getField())
&& StringUtils.isNotBlank(request.getOrder())
&& !StringUtils.equalsIgnoreCase(request.getField(), "null")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index 1af47de..dd6b455 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -5,10 +5,11 @@
import java.util.function.Consumer;
import java.util.stream.Collectors;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.entity.system.SysConfig;
import cc.mrbird.febs.common.core.exception.FebsException;
-import cc.mrbird.febs.common.core.utils.MyUtil;
+import cc.mrbird.febs.common.core.utils.*;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.feign.IRemoteDicItemService;
@@ -39,9 +40,6 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.entity.system.Dept;
import cc.mrbird.febs.common.core.entity.system.DicItem;
-import cc.mrbird.febs.common.core.utils.CastUtil;
-import cc.mrbird.febs.common.core.utils.FebsUtil;
-import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
@@ -95,6 +93,7 @@
@Override
public IPage<EmpBaseInfo> findZsEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo) {
Page<EmpBaseInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
IPage<EmpBaseInfo> iPage = empBaseInfoMapper.selectPageVo(page, createQueryWrapper(empBaseInfo));
//设置部门
// List<EmpBaseInfo> list = setDeptName(iPage.getRecords());
--
Gitblit v1.8.0