Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-08 4e52cb2253af9a22571c7d0c239ee283178d2fd4

 febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/PositionServiceImpl.java

@@ -1,7 +1,10 @@
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.common.core.utils.SequenceUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.system.mapper.PositionMapper;
import cc.mrbird.febs.server.system.service.IPositionService;
import org.apache.commons.lang3.StringUtils;
@@ -19,7 +22,6 @@
import java.util.*;

/**
*
* name:Position
* package:cc.mrbird.febs.server.system.controller
* description:岗位信息服务接口实现
@@ -34,9 +36,11 @@
class PositionServiceImpl extends ServiceImpl<PositionMapper, Position> implements IPositionService {

private final PositionMapper positionMapper;
    private final RedisService redisService;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");

@Override
public IPage<Position> findPositions(QueryRequest request, Position position) {
LambdaQueryWrapper<Position> queryWrapper = new LambdaQueryWrapper<>();
@@ -60,7 +64,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void createPosition(Position position) {
    position.setPositionId(UUID.randomUUID().toString());
        position.setPositionId(SequenceUtil.generateId(0L, ModuleCode.FRAM_SYSTEM));
position.setCreator(FebsUtil.getCurrentUsername());
position.setModifier(FebsUtil.getCurrentUsername());
this.save(position);
@@ -86,14 +90,15 @@
// TODO 设置删除条件
this.remove(wrapper);
}

/**
*
* 根据Id批量逻辑删除记录
*
     * <p>
* date 2021-01-28 10:48
* @author: luoyibo
     *
* @param ids 待删除Id
* @return void
     * @author: luoyibo
*/
@Override
@Transactional(rollbackFor = Exception.class)