From 85634b7f43eac1920281cd927325e0be985f1aa8 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 02 四月 2021 01:04:10 +0800
Subject: [PATCH] fix(bug修复): 在职员工授权与人员入司工龄计算
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
index 5142ddd..8698d06 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
@@ -87,7 +87,7 @@
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpLeaveInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
- SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ SortUtil.handlePageSort(request, page, "beginTime", FebsConstant.ORDER_ASC, true);
IPage<EmpLeaveInfo> iPage = empLeaveinfoMapper.selectPageVo(page, queryWrapper);
iPage.setRecords(this.convertDicItemName(iPage.getRecords()));
return iPage;
@@ -177,7 +177,7 @@
returnList.add(StrUtil.format("导入员工请假记录异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- leaveInfo.setDelFlag(2);
+ leaveInfo.setDelFlag(0);
leaveInfo.setEmpId(empBaseInfo.getEmpId());
leaveInfo.setDeptName(list.get(1).toString());
leaveInfo.setDeptId(dept.getDeptId());
--
Gitblit v1.8.0