From 1b170de4c1d4bd3f43f7a401fd68e73effd3f464 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 19 二月 2021 17:19:34 +0800
Subject: [PATCH] feat(分支合并): 在职员工
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FolderServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FolderServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FolderServiceImpl.java
index 44d7de8..82f908f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FolderServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FolderServiceImpl.java
@@ -59,6 +59,7 @@
folder.setModifier(operatorId);
folder.setCreatetime(new Date());
folder.setModifytime(new Date());
+ folder.setVersion(0);
this.save(folder);
}
@@ -72,8 +73,11 @@
@Transactional(rollbackFor = Exception.class)
public void deleteFolder(Folder folder) {
LambdaUpdateWrapper<Folder> wapper = new LambdaUpdateWrapper<>();
- wapper.eq(Folder::getFolderid,folder.getFolderid()).setSql("delFlag = 1");
- // TODO 设置删除条件
- this.update(wapper);
+ wapper.eq(Folder::getFolderid,folder.getFolderid());
+ Folder updatefolder = new Folder();
+ updatefolder.setModifier(operatorId);
+ updatefolder.setModifytime(new Date());
+ updatefolder.setDelFlag(1);
+ this.update(updatefolder,wapper);
}
}
--
Gitblit v1.8.0