From b5a83c9f336b99c2a72ceba33050943ce8ee5d04 Mon Sep 17 00:00:00 2001
From: tangqian <tangqian..110>
Date: Fri, 9 Jun 2023 17:03:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/promoter/PromoterController.java    | 22 +++++++++++++++++++
 .../admin/promoter/vo/PromoterRespVO.java     |  2 ++
 .../promoter/vo/PromoterUpdateReqVO.java      |  2 ++
 .../mapper/promoter/PromoterMapper.xml        |  2 +-
 .../admin/dept/vo/dept/DeptRespVO.java        |  3 ++-
 .../system/service/dept/DeptServiceImpl.java  |  2 +-
 6 files changed, 30 insertions(+), 3 deletions(-)

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 3529ad176..9170321d5 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
@@ -127,4 +127,26 @@ public class PromoterController {
         List<PromoterImportExcelVO> list = ExcelUtils.read(file, PromoterImportExcelVO.class);
         return success(promoterService.importUserList(list, updateSupport));
     }
+
+
+    //=======================================排除租户访问========================================
+    @GetMapping("/allPage")
+    @Operation(summary = "获取所有推广员")
+    @TenantIgnore
+    public CommonResult<PageResult<PromoterRespVO>> getAllPromoterPage(@Valid PromoterPageReqVO pageVO) {
+        PageResult<PromoterRespVO> pageResult = promoterService.getPromoterPage(pageVO);
+        return success(pageResult);
+    }
+
+    @PutMapping("/tenantIgnoreUpdate")
+    @Operation(summary = "排除祖父更新推广员")
+    @TenantIgnore
+    public CommonResult<Boolean> updateByPromoter(@Valid @RequestBody PromoterUpdateReqVO updateReqVO) {
+        promoterService.updatePromoter(updateReqVO);
+        return success(true);
+    }
+
+
+//=======================================排除租户访问========================================
+
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterRespVO.java
index 645b00a16..772a88ac0 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterRespVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterRespVO.java
@@ -20,4 +20,6 @@ public class PromoterRespVO extends PromoterBaseVO {
     private String deptName;
     @Schema(description = "注册来源", required = true, example = "1")
     private String sourceType;
+    @Schema(description = "租户id")
+    private Long tenantId;
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterUpdateReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterUpdateReqVO.java
index d0a6a90df..ab6232576 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterUpdateReqVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterUpdateReqVO.java
@@ -14,5 +14,7 @@ public class PromoterUpdateReqVO extends PromoterBaseVO {
     @Schema(description = "编号", required = true, example = "3051")
     @NotNull(message = "编号不能为空")
     private Long id;
+    @Schema(description = "租户id")
+    private Long tenantId;
 
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/promoter/PromoterMapper.xml b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/promoter/PromoterMapper.xml
index 8f7e417de..a6691ac77 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/promoter/PromoterMapper.xml
+++ b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/promoter/PromoterMapper.xml
@@ -10,7 +10,7 @@
      -->
 
     <select id="findListPage" resultType="cn.iocoder.yudao.module.member.controller.admin.promoter.vo.PromoterRespVO">
-        select a.id,a.user_id,a.dept_id,b.nickname,b.status,b.mobile,c.parent_organization_name as 'orgName',a.source_type from member_promoter a
+        select a.id,a.user_id,a.dept_id,b.nickname,b.status,b.mobile,c.parent_organization_name as 'orgName',a.source_type,a.tenant_id from member_promoter a
                           left join member_user b on a.user_id = b.id
                             left join system_dept c on c.id=a.dept_id
         <where>
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptRespVO.java
index 7d8933a0c..6e7f2a3d2 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptRespVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptRespVO.java
@@ -19,5 +19,6 @@ public class DeptRespVO extends DeptBaseVO {
 
     @Schema(description = "创建时间", required = true, example = "时间戳格式")
     private LocalDateTime createTime;
-
+    @Schema(description = "租户id")
+    private Long tenantId;
 }
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 6d34d8d50..278ee0952 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
@@ -384,7 +384,7 @@ public class DeptServiceImpl implements DeptService {
                 deptDO4.setParentId(deptDO.getId());
                 deptDO4.setParentOrganizationName(deptDO.getParentOrganizationName() + ">" + batchImportVO.getDepName());
                 deptMapper.insert(deptDO4);
-                deptDO4.setParentOrganizationIds(deptDO.getParentOrganizationIds() + ">" + deptDO4.getId());
+                deptDO4.setParentOrganizationIds(deptDO.getParentOrganizationIds() + "," + deptDO4.getId());
                 deptMapper.update(deptDO4, Wrappers.<DeptDO>lambdaUpdate().eq(DeptDO::getId, deptDO4.getId()));
                 deptDOS4.add(deptDO4);
             }