Merge branch 'lybDevelop'

luoyb

2021-02-19 f52362127751004c996ca9ee2f6f87d7e010b424

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FolderServiceImpl.java

@@ -59,6 +59,7 @@
        folder.setModifier(operatorId);
        folder.setCreatetime(new Date());
        folder.setModifytime(new Date());
        folder.setVersion(0);
        this.save(folder);
    }

@@ -72,8 +73,11 @@
    @Transactional(rollbackFor = Exception.class)
    public void deleteFolder(Folder folder) {
        LambdaUpdateWrapper<Folder> wapper = new LambdaUpdateWrapper<>();
        wapper.eq(Folder::getFolderid,folder.getFolderid()).setSql("delFlag = 1");
        // TODO 设置删除条件
        this.update(wapper);
        wapper.eq(Folder::getFolderid,folder.getFolderid());
        Folder updatefolder = new Folder();
        updatefolder.setModifier(operatorId);
        updatefolder.setModifytime(new Date());
        updatefolder.setDelFlag(1);
        this.update(updatefolder,wapper);
    }
}