From 2f2da07fa36a1e0d65b99998098a73624d63d7ed Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期二, 16 三月 2021 11:04:15 +0800
Subject: [PATCH] 修改文件分类

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
index 2953b73..46b98f8 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
@@ -7,8 +7,10 @@
 import java.util.List;
 import java.util.Optional;
 
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
 import cc.mrbird.febs.common.core.entity.system.SystemUser;
 import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.common.core.utils.SortUtil;
 import cc.mrbird.febs.server.hr.constant.MyConstant;
 import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
 import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
@@ -92,10 +94,12 @@
 			queryWrapper.eq("a.SettleStatus", empAccidentcases.getSettleStatus());
 		}
 		if (StringUtils.isNotBlank(empAccidentcases.getEmpStatus())) {
-			queryWrapper.eq("a.EmpStatus", empAccidentcases.getEmpStatus());
+			queryWrapper.in("a.EmpStatus", empAccidentcases.getEmpStatus().split(","));
 		}
 		queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
+
 		Page<EmpAccidentCases> page = new Page<>(request.getPageNum(), request.getPageSize());
+        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
 		return empAccidentcasesMapper.selectPageVo(page, queryWrapper);
 	}
 
@@ -253,4 +257,6 @@
 			this.save(empAccidentcases);
 		}
 	}
+
+
 }

--
Gitblit v1.8.0