From 8c318c3890c4a3f418eb7636e45d49737ea05643 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期一, 15 三月 2021 23:18:40 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
index fba91d1..56991a4 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
@@ -153,7 +153,38 @@
if (StrUtil.isNotBlank(vo.getFileName())){
queryWrapper.like("acc.filesName", vo.getFileName());
}
- queryWrapper.orderByAsc("a.deptName,a.empName");
+ if (StrUtil.equals(vo.getField(),"empName")){
+ if (StrUtil.equals(vo.getOrder(),"descending")){
+ queryWrapper.orderByDesc("a.empName");
+ }else{
+ queryWrapper.orderByAsc("a.empName");
+ }
+ }else if(StrUtil.equals(vo.getField(),"empNumb")){
+ if (StrUtil.equals(vo.getOrder(),"descending")){
+ queryWrapper.orderByDesc("a.empNumb");
+ }else{
+ queryWrapper.orderByAsc("a.empNumb");
+ }
+ }else if(StrUtil.equals(vo.getField(),"deptName")){
+ if (StrUtil.equals(vo.getOrder(),"descending")){
+ queryWrapper.orderByDesc("deptName");
+ }else{
+ queryWrapper.orderByAsc("deptName");
+ }
+ }else if(StrUtil.equals(vo.getField(),"jobName")){
+ if (StrUtil.equals(vo.getOrder(),"descending")){
+ queryWrapper.orderByDesc("a.jobName");
+ }else{
+ queryWrapper.orderByAsc("a.jobName");
+ }
+ }else if(StrUtil.equals(vo.getField(),"certificateNumb")){
+ if (StrUtil.equals(vo.getOrder(),"descending")){
+ queryWrapper.orderByDesc("a.certificateNumb");
+ }else{
+ queryWrapper.orderByAsc("a.certificateNumb");
+ }
+ }
+
queryWrapper.groupBy(" a.delFlag,a.empName,a.empStatus,a.empId,a.certificateNumb,a.empNumb,deptName,a.jobName");
Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize());
// String querySql = empAccessoryMapper.getQuerySql();
--
Gitblit v1.8.0