From 749ad6fe2e845433622992aa0aacd8b0d7714ccc Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 05 三月 2021 00:34:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FolderServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 cf984dc..1303bcc 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
@@ -5,6 +5,7 @@
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.server.hr.entity.FilesUpload;
import cc.mrbird.febs.server.hr.entity.Folder;
+import cc.mrbird.febs.server.hr.entity.Label;
import cc.mrbird.febs.server.hr.mapper.FolderMapper;
import cc.mrbird.febs.server.hr.service.IFolderService;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -73,7 +74,10 @@
@Transactional(rollbackFor = Exception.class)
public void deleteFolder(Folder folder) {
LambdaUpdateWrapper<Folder> wapper = new LambdaUpdateWrapper<>();
- wapper.eq(Folder::getFolderid,folder.getFolderid()).setSql("delFlag = 1");
+ wapper.eq(Folder::getFolderid,folder.getFolderid());
+ wapper.set(Folder::getDelFlag,1);
+ wapper.set(Folder::getModifier,operatorId);
+ wapper.set(Folder::getModifytime,new Date());
this.update(wapper);
}
}
--
Gitblit v1.8.0