From e3ee3dac0ef868d7c58295c89003cc35deab16d1 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 17 二月 2021 21:36:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/PositionServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/PositionServiceImpl.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/PositionServiceImpl.java
index 82d6716..e0451db 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/PositionServiceImpl.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/PositionServiceImpl.java
@@ -61,8 +61,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void createPosition(Position position) {
-position.setCreator(operatorId);
-position.setModifier(operatorId);
+position.setCreator(FebsUtil.getCurrentUsername());
+position.setModifier(FebsUtil.getCurrentUsername());
this.save(position);
}
@@ -100,6 +100,11 @@
public void logicDelPosition(String ids) {
String[] str = ids.split(",");
List<String> list = new ArrayList<>(Arrays.asList(str));
- positionMapper.logicDeleteByIds(list, operatorId);
+ for (String strs:list){
+ LambdaQueryWrapper<Position> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Position::getPositionId, strs);
+// TODO 设置删除条件
+ this.remove(wrapper);
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0