From 906f38b1427bd6ee6506723e5d2ae09137dbbe5b Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期五, 26 二月 2021 00:25:17 +0800
Subject: [PATCH] 年龄查询改成或的关系
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FolderServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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..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;
@@ -59,6 +60,7 @@
folder.setModifier(operatorId);
folder.setCreatetime(new Date());
folder.setModifytime(new Date());
+ folder.setVersion(0);
this.save(folder);
}
@@ -72,8 +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");
- // TODO 设置删除条件
+ 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