From 6c8b316dfd6e6b448b2edce742f69bd4ba52db4b Mon Sep 17 00:00:00 2001 From: xupei Date: Fri, 28 Nov 2025 14:40:09 +0800 Subject: [PATCH] =?UTF-8?q?BUGFIX:=20=E6=B7=BB=E5=8A=A0=E5=B7=B2=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E7=9A=84=E8=B4=A6=E5=8F=B7=E4=B8=BA=E5=AD=90=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E8=AF=A5=E8=B4=A6=E5=8F=B7=E6=9C=89=E6=95=88?= =?UTF-8?q?=E6=9C=9F=E6=B2=A1=E6=9C=89=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ai/da/service/impl/AccountServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 4a9e4a49..463e5282 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -2492,8 +2492,15 @@ public class AccountServiceImpl extends ServiceImpl impl if (Objects.nonNull(subAccount) && personAccRole.contains(subAccount.getSystemUser())) { log.info("将用户{} 加入组织{}", addSubAccountDTO.getUserEmail(), adminAcc.getOrganizationName()); subAccount.setUserName(addSubAccountDTO.getUserName()); - if (!StringUtil.isNullOrEmpty(addSubAccountDTO.getUserPassword())) + if (!StringUtil.isNullOrEmpty(addSubAccountDTO.getUserPassword())){ subAccount.setUserPassword(addSubAccountDTO.getUserPassword()); + } + + // 判断当前账号的有效期是否与管理员同步 + if (subAccount.getValidEndTime() < adminAcc.getValidEndTime()){ + subAccount.setValidEndTime(adminAcc.getValidEndTime()); + } + subAccount.setSystemUser(subUserRole); subAccount.setOrganizationName(adminAcc.getOrganizationName()); subAccount.setParentId(adminAcc.getId()); @@ -2572,11 +2579,6 @@ public class AccountServiceImpl extends ServiceImpl impl throw new BusinessException("Access denied. Insufficient permissions."); } - // 判断当前账号的有效期是否与管理员同步 - if (exAccountInfo.getValidEndTime() < adminAcc.getValidEndTime()){ - exAccountInfo.setValidEndTime(adminAcc.getValidEndTime()); - } - // 校验用户名是否同名 if (!StringUtil.isNullOrEmpty(addSubAccountDTO.getUserName()) && !exAccountInfo.getUserName().equals(addSubAccountDTO.getUserName())