Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-13 cd26732c2a34dbc3f24b0cca8d82e8a365fcba7b

 febs-server/febs-server-generator/src/main/resources/generator/templates/serviceImpl.ftl

@@ -76,9 +76,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void delete${className}(${className} ${className?uncap_first}) {
LambdaQueryWrapper<${className}> wapper = new LambdaQueryWrapper<>();
LambdaQueryWrapper<${className}> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
this.remove(wapper);
this.remove(wrapper);
}
/**
*
@@ -92,9 +92,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void logicDel${className}(String ids) {
List<String> list = new ArrayList<>();
    String[] str = ids.split(",");
    list.addAll(Arrays.asList(str));
    List<String> list = new ArrayList<>(Arrays.asList(str));
    ${className?uncap_first}Mapper.logicDeleteByIds(list, operatorId);
    }
}