From 0ad6eb5da00eb35a68ec892db9b75bf4c7b79afc Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 24 四月 2021 17:55:57 +0800
Subject: [PATCH] fix(bug修复): 去掉了版本号乐观锁
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.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/EmpUnemploymentServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
index 46724b1..e01a550 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
@@ -88,7 +88,7 @@
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpUnemployment> page = new Page<>(request.getPageNum(), request.getPageSize());
- SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ SortUtil.handlePageSort(request, page, "applayDate", FebsConstant.ORDER_ASC, true);
return empUnemploymentMapper.selectPageVo(page, queryWrapper);
}
@@ -192,7 +192,7 @@
returnList.add(StrUtil.format("导入失业金领取异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- empUnemployment.setDelFlag(2);
+ empUnemployment.setDelFlag(0);
empUnemployment.setEmpId(empId);
empUnemployment.setDeptName(list.get(1).toString());
empUnemployment.setDeptId(dept.getDeptId());
--
Gitblit v1.8.0