From a8bed6daea5edeb2f8bb5d0de98f9c46637d39df Mon Sep 17 00:00:00 2001 From: MicLng <81649078@qq.com> Date: Tue, 2 Nov 2021 11:59:53 +0800 Subject: [PATCH] :arrow_up: Upgrading dependencies. close #3090 up mybatis-plus 3.4.3.4 --- README.md | 5 +++++ .../service/impl/SysTenantServiceImpl.java | 18 ++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 32b332a03..544dbb60b 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,11 @@ pigX 并非一个开源软件，作者保留全部的权利。 将本项目的部分或全部代码和资源进行任何形式的再发行（上传GitHub、Gitee ） +### 侵权处理 + +- 支付￥ 100000 侵权费用（含我方法律援助费用）,本团队已完全委托博睿律师事务所 司法保护 +- 个人行为将直接收集材料邮寄贵司侵权律师函，若出现司法诉讼将直接影响当事人征信档案等特此说明 + ## 贡献代码 pigX并非一个开源项目，也不是社区共同创造，其全部功能由作者独立完成。 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java index 0431c055d..d0d42c95c 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java @@ -41,6 +41,8 @@ import java.util.stream.Collectors; /** * 租户 * + * mybatis-plus 3.4.3.3 特殊处理 https://github.com/baomidou/mybatis-plus/pull/3592 + * * @author lengleng * @date 2019-05-15 15:55:41 */ @@ -167,16 +169,19 @@ public class SysTenantServiceImpl extends ServiceImpl d.setId(null)).collect(Collectors.toList())); // 处理字典项最新关联的字典ID - List itemList = dictList.stream().flatMap(dict -> dictItemList.stream() - .filter(item -> item.getType().equals(dict.getType())).peek(item -> item.setDictId(dict.getId()))) - .collect(Collectors.toList()); + List itemList = dictList.stream().flatMap( + dict -> dictItemList.stream().filter(item -> item.getType().equals(dict.getType())).peek(item -> { + item.setDictId(dict.getId()); + item.setId(null); + })).collect(Collectors.toList()); // 插入客户端 - clientServices.saveBatch(clientDetailsList); + clientServices.saveBatch(clientDetailsList.stream().peek(d -> d.setId(null)).collect(Collectors.toList())); // 插入系统配置 - paramService.saveBatch(publicParamList); + paramService + .saveBatch(publicParamList.stream().peek(d -> d.setPublicId(null)).collect(Collectors.toList())); return dictItemService.saveBatch(itemList); })); @@ -192,6 +197,7 @@ public class SysTenantServiceImpl extends ServiceImpl menu.getParentId().equals(originParentId)).forEach(menu -> { // 保存菜单原始menuId， 方便查询子节点使用 Integer originMenuId = menu.getMenuId(); + menu.setMenuId(null); menu.setParentId(targetParentId); menuService.save(menu); // 查找此节点的子节点，然后子节点的重新插入父节点更改为新的menuId