Merge branch 'feature/mall_product'

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<PromoterRespVO> pageResult = promoterService.getPromoterPage(pageVO);

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

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java

@@ -170,12 +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(updateReqVO.getId());
-        reqVO.setName(updateReqVO.getName());
-        reqVO.setId(dept.getId());
-        deptService.updateDept(reqVO);
     }
 
     /**