fix: 修改

feature/mall_product
tangqian 2023-06-09 17:03:39 +08:00
parent fe4236d607
commit b5a83c9f33
6 changed files with 30 additions and 3 deletions

View File

@ -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);
}
//=======================================排除租户访问========================================
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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>

View File

@ -19,5 +19,6 @@ public class DeptRespVO extends DeptBaseVO {
@Schema(description = "创建时间", required = true, example = "时间戳格式")
private LocalDateTime createTime;
@Schema(description = "租户id")
private Long tenantId;
}

View File

@ -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);
}