From 7c060b5a8b1d034948e5844f32f8bdb740bd9303 Mon Sep 17 00:00:00 2001 From: tangqian Date: Fri, 16 Jun 2023 13:01:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E6=8E=A8=E5=B9=BF=E5=91=98=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/service/dept/DeptServiceImpl.java | 1 + .../module/system/service/tenant/TenantServiceImpl.java | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java index f384dfa28..bf78bd297 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java @@ -149,6 +149,7 @@ public class DeptServiceImpl implements DeptService { }); deptMapper.updateBatch(deptDOS, deptDOS.size()); deptDO.setName(reqVO.getName()); + deptDO.setParentOrganizationName(reqVO.getName()); deptMapper.updateById(deptDO); // 发送刷新消息 deptProducer.sendDeptRefreshMessage(); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java index 76fd21b8a..8f96175b3 100755 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java @@ -170,15 +170,6 @@ public class TenantServiceImpl implements TenantService { if (ObjectUtil.notEqual(tenant.getPackageId(), updateReqVO.getPackageId())) { updateTenantRoleMenu(tenant.getId(), tenantPackage.getMenuIds()); } - // 同步修改部门信息 - DeptUpdateReqVO reqVO = new DeptUpdateReqVO(); - DeptDO dept = deptService.getDept(updateObj.getId()); - if (null != dept) { - reqVO.setName(updateObj.getName()); - reqVO.setId(dept.getId()); - deptService.updateDept(reqVO); - } - } /** From e99801eddd49fd5904791bb0eeb84f323846908c Mon Sep 17 00:00:00 2001 From: tangqian Date: Fri, 16 Jun 2023 13:03:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E6=8E=A8=E5=B9=BF=E5=91=98=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/controller/admin/promoter/PromoterController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/PromoterController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/PromoterController.java index 94f19342b..ec599deed 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/PromoterController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/PromoterController.java @@ -150,6 +150,7 @@ public class PromoterController { @GetMapping("/all-export-excel") @Operation(summary = "导出所有推广员 Excel") @OperateLog(type = EXPORT) + @TenantIgnore public void allExportExcel(@Valid PromoterPageReqVO pageVO, HttpServletResponse response) throws IOException { PageResult pageResult = promoterService.getPromoterPage(pageVO);