From 41f5434217c77cb0fd87b08008876f7a5be5af55 Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期三, 17 二月 2021 15:42:05 +0800
Subject: [PATCH] 提交用戶管理字段

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

--
Gitblit v1.8.0