From 6558a11228f9b6bbba607465bef87ad59677f34f Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 20 Apr 2026 13:53:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93#1499=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/organ/vo/organ/OrganSaveReqVO.java | 8 ++++---- .../module/system/service/organ/OrganServiceImpl.java | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganSaveReqVO.java index 122492335..67ac7134f 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganSaveReqVO.java @@ -27,14 +27,14 @@ public class OrganSaveReqVO { private String name; @Schema(description = "管理员姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "晨丰") - @NotNull(message = "联系人不能为空") - @Size(min = 1, max = 30, message = "联系人长度不能超过30个字符") + @NotNull(message = "管理员姓名不能为空", groups = {OrganSaveCreateGroup.class}) + @Size(min = 1, max = 30, message = "管理员姓名长度不能超过30个字符", groups = {OrganSaveCreateGroup.class}) private String orgAdminName; @Schema(description = "管理员账号", example = "15601691300") @Mobile - @NotNull(message = "管理员账号不能为空") - @Size(max = 11, message = "管理员账号（手机号）长度不能超过11个字符") + @NotNull(message = "管理员账号不能为空", groups = {OrganSaveCreateGroup.class}) + @Size(max = 11, message = "管理员账号（手机号）长度不能超过11个字符", groups = {OrganSaveCreateGroup.class}) private String orgAdminMobile; @Schema(description = "组织状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java index 6365e0863..c88f60e2a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java @@ -306,7 +306,10 @@ public class OrganServiceImpl implements OrganService { organMapper.updateById(updateObj); // 更新产品购买记录 - purchaseService.updateOrgInitProductPurchaseRecord(organId, updateReqVO.getProductPurchaseReqVOS()); + List productPurchaseReqVOS = updateReqVO.getProductPurchaseReqVOS(); + if (CollUtil.isNotEmpty(productPurchaseReqVOS)) { + purchaseService.updateOrgInitProductPurchaseRecord(organId, productPurchaseReqVOS); + } if (CommonStatusEnum.DISABLE.getStatus().equals(updateReqVO.getStatus())) { // 移除机构下用户的token