From 35c2236d4a3203d93689b57588e413991d41b858 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 05 二月 2021 20:37:49 +0800
Subject: [PATCH] fix(人力微服务): 信息录入

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.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/EmpUnemploymentServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
index 891794a..63adc3d 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
@@ -40,7 +40,7 @@
     @Override
     public IPage<EmpUnemployment> findEmpUnemployments(QueryRequest request, EmpUnemployment empUnemployment) {
         LambdaQueryWrapper<EmpUnemployment> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(EmpUnemployment::getDelFlag, 0);
+        queryWrapper.eq(EmpUnemployment::getDelFlag, empUnemployment.getDelFlag());
         Page<EmpUnemployment> page = new Page<>(request.getPageNum(), request.getPageSize());
         return this.page(page, queryWrapper);
     }
@@ -48,7 +48,7 @@
     @Override
     public List<EmpUnemployment> findEmpUnemployments(EmpUnemployment empUnemployment) {
         LambdaQueryWrapper<EmpUnemployment> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(EmpUnemployment::getDelFlag, 0);
+        queryWrapper.eq(EmpUnemployment::getDelFlag, empUnemployment.getDelFlag());
         return this.baseMapper.selectList(queryWrapper);
     }
 
@@ -97,4 +97,11 @@
         List<String> list = new ArrayList<>(Arrays.asList(str));
         empUnemploymentMapper.logicDeleteByIds(list, operatorId);
     }
+
+    @Override
+    public boolean momentToNormal(String ids) {
+        String[] str = ids.split(",");
+        List<String> list = new ArrayList<>(Arrays.asList(str));
+        return empUnemploymentMapper.momentToNormal(list, operatorId)>0;
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0