zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/mall_product' into test

pull/17/head
tangqian 2023-06-16 13:04:08 +08:00
parent 103354947b e99801eddd
commit 29608d4f69
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/PromoterController.java
View File

@ -150,6 +150,7 @@ public class PromoterController {
@GetMapping("/all-export-excel") @GetMapping("/all-export-excel")
@Operation(summary = "导出所有推广员 Excel") @Operation(summary = "导出所有推广员 Excel")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
@TenantIgnore
public void allExportExcel(@Valid PromoterPageReqVO pageVO, public void allExportExcel(@Valid PromoterPageReqVO pageVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {
PageResult<PromoterRespVO> pageResult = promoterService.getPromoterPage(pageVO); PageResult<PromoterRespVO> pageResult = promoterService.getPromoterPage(pageVO);

1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
View File

@ -149,6 +149,7 @@ public class DeptServiceImpl implements DeptService {
}); });
deptMapper.updateBatch(deptDOS, deptDOS.size()); deptMapper.updateBatch(deptDOS, deptDOS.size());
deptDO.setName(reqVO.getName()); deptDO.setName(reqVO.getName());
deptDO.setParentOrganizationName(reqVO.getName());
deptMapper.updateById(deptDO); deptMapper.updateById(deptDO);
// 发送刷新消息 // 发送刷新消息
deptProducer.sendDeptRefreshMessage(); deptProducer.sendDeptRefreshMessage();

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

@ -170,15 +170,6 @@ public class TenantServiceImpl implements TenantService {
if (ObjectUtil.notEqual(tenant.getPackageId(), updateReqVO.getPackageId())) { if (ObjectUtil.notEqual(tenant.getPackageId(), updateReqVO.getPackageId())) {
updateTenantRoleMenu(tenant.getId(), tenantPackage.getMenuIds()); 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);
}
} }
/** /**