From ecad6bdfc3a547d8aa4ae80aec4f060c10e442e0 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期五, 26 二月 2021 17:05:31 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/PositionServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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..38313e7 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
@@ -1,7 +1,6 @@
package cc.mrbird.febs.server.system.service.impl;
-import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.system.Position;
import cc.mrbird.febs.server.system.mapper.PositionMapper;
import cc.mrbird.febs.server.system.service.IPositionService;
@@ -16,7 +15,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.utils.FebsUtil;
-import cc.mrbird.febs.common.core.utils.SequenceUtil;
import java.util.*;
@@ -48,7 +46,8 @@
}
queryWrapper.orderByDesc(Boolean.parseBoolean("createTime"));
Page<Position> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
+ IPage<Position> page1 = this.page(page, queryWrapper);
+ return page1;
}
@Override
@@ -61,8 +60,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void createPosition(Position position) {
-position.setCreator(operatorId);
-position.setModifier(operatorId);
+ position.setPositionId(UUID.randomUUID().toString());
+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