Merge branch 'lybDevelop'

luoyb

2021-02-18 b230858cc0d2ee4fdb177c91c4e11cdf3dd57364

 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);
    }
    }
}