From 165e00495c05e4f89ac6c3902620e235944965ab Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期二, 09 二月 2021 00:09:57 +0800
Subject: [PATCH] 新增文件管理功能
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
index ce302be..2de822a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
@@ -40,7 +40,7 @@
@Override
public IPage<EmpResign> findEmpResigns(QueryRequest request, EmpResign empResign) {
LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpResign::getDelFlag, 0);
+ queryWrapper.eq(EmpResign::getDelFlag, empResign.getDelFlag());
Page<EmpResign> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -48,7 +48,7 @@
@Override
public List<EmpResign> findEmpResigns(EmpResign empResign) {
LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpResign::getDelFlag, 0);
+ queryWrapper.eq(EmpResign::getDelFlag, empResign.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +97,11 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empResignMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empResignMapper.momentToNormal(list, operatorId)>0;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0