From ab863e67e115f0810dce0e31484d4ba26e46b1f2 Mon Sep 17 00:00:00 2001 From: tangqian Date: Fri, 16 Jun 2023 11:53:37 +0800 Subject: [PATCH 1/5] =?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 --- .../system/service/tenant/TenantServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 d09341491..76fd21b8a 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 @@ -172,10 +172,13 @@ public class TenantServiceImpl implements TenantService { } // 同步修改部门信息 DeptUpdateReqVO reqVO = new DeptUpdateReqVO(); - DeptDO dept = deptService.getDept(updateReqVO.getId()); - reqVO.setName(updateReqVO.getName()); - reqVO.setId(dept.getId()); - deptService.updateDept(reqVO); + DeptDO dept = deptService.getDept(updateObj.getId()); + if (null != dept) { + reqVO.setName(updateObj.getName()); + reqVO.setId(dept.getId()); + deptService.updateDept(reqVO); + } + } /** From 7c060b5a8b1d034948e5844f32f8bdb740bd9303 Mon Sep 17 00:00:00 2001 From: tangqian Date: Fri, 16 Jun 2023 13:01:17 +0800 Subject: [PATCH 2/5] =?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 3/5] =?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); From 8604602f83d90e07f3003051d962aa7b3919e622 Mon Sep 17 00:00:00 2001 From: tangqian Date: Fri, 16 Jun 2023 13:27:39 +0800 Subject: [PATCH 4/5] =?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 --- .../shop/service/order/impl/StoreOrderServiceImpl.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java index b037cd499..dd91bd4b5 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java @@ -1188,9 +1188,6 @@ public class StoreOrderServiceImpl extends ServiceImpl infoDOS = new ArrayList<>(); orderInfos.forEach(info -> { From 2e915fe106e0b9f0153052b20c788f30a5e24983 Mon Sep 17 00:00:00 2001 From: axzsd Date: Fri, 16 Jun 2023 13:55:56 +0800 Subject: [PATCH 5/5] =?UTF-8?q?test=20=E5=88=86=E6=94=AF=20=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E6=9C=8D=E5=86=85=E5=AD=98=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- builds/Dockerfile | 2 +- builds/docker-compose-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builds/Dockerfile b/builds/Dockerfile index 995db64f9..ac8f65536 100644 --- a/builds/Dockerfile +++ b/builds/Dockerfile @@ -5,7 +5,7 @@ LABEL Author="axzsd" \ Description="创盈支付服务端" ENV SPRING_PROFILES_ACTIVE="dev" -ENV JAVA_OPTIONS "-Xms800m -Xmx800m \ +ENV JAVA_OPTIONS "-Xms1024m -Xmx2048m \ -XX:+HeapDumpOnOutOfMemoryError \ -Dfile.encoding=UTF-8 \ -Djava.awt.headless=true \ diff --git a/builds/docker-compose-test.yml b/builds/docker-compose-test.yml index 290d59145..05dbefd92 100644 --- a/builds/docker-compose-test.yml +++ b/builds/docker-compose-test.yml @@ -20,7 +20,7 @@ services: deploy: resources: limits: - memory: 800MB + memory: 2048MB healthcheck: test: ["CMD", "curl", "-f", "http://localhost:48080/actuator/health"] timeout: 30s