From 4c88225f35954d15d50100a5552f7fd29f35e423 Mon Sep 17 00:00:00 2001 From: xuyuxiang Date: Wed, 30 Jul 2025 20:25:35 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=88=A4=E6=96=AD=E6=B3=A8=E5=86=8C=E7=9A=84=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=82=AE=E7=AE=B1=E5=92=8C=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81=E7=BB=91=E5=AE=9A=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ClientUserServiceImpl.java | 56 +++++++------------ .../user/service/impl/SysUserServiceImpl.java | 56 +++++++------------ 2 files changed, 40 insertions(+), 72 deletions(-) diff --git a/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/service/impl/ClientUserServiceImpl.java b/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/service/impl/ClientUserServiceImpl.java index 390bc212..30b5708d 100644 --- a/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/service/impl/ClientUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/service/impl/ClientUserServiceImpl.java @@ -1017,52 +1017,36 @@ public class ClientUserServiceImpl extends ServiceImpl().eq(ClientUserExt::getUserId, StpClientUtil.getLoginIdAsString()) + ClientUserExt clientUserExt = clientUserExtService.getOne(new LambdaQueryWrapper() + .eq(ClientUserExt::getUserId, loginId) .eq(ClientUserExt::getSourceFromType, ClientUserSourceFromTypeEnum.SYSTEM_REGISTER.getValue())); - // 不为空，则判断手机号是否为空 - if(ObjectUtil.isNotEmpty(clientUserExt)){ - // 手机号为空，判断系统注册后是否需要绑定手机号 - if(ObjectUtil.isEmpty(clientUser.getPhone())) { - String registerNeedBindPhone = devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_REGISTER_NEED_BIND_PHONE_FOR_C_KEY); - if(ObjectUtil.isNotEmpty(registerNeedBindPhone)){ - return Convert.toBool(registerNeedBindPhone); - } else { - return false; - } - } else { - return false; - } - } else { - return false; - } + // 判断是否需要绑定手机号 + return ObjectUtil.isNotEmpty(clientUserExt) + && ObjectUtil.isEmpty(clientUser.getPhone()) + ? Convert.toBool(devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_REGISTER_NEED_BIND_PHONE_FOR_C_KEY), false) + : false; } @Override public Boolean isUserNeedBindEmail() { + // 获取当前用户id + String loginId = StpClientUtil.getLoginIdAsString(); // 获取当前用户 - ClientUser clientUser = this.queryEntity(StpClientUtil.getLoginIdAsString()); + ClientUser clientUser = this.queryEntity(loginId); // 查询当前用户是否注册的 - ClientUserExt clientUserExt = clientUserExtService.getOne(new LambdaQueryWrapper().eq(ClientUserExt::getUserId, StpClientUtil.getLoginIdAsString()) + ClientUserExt clientUserExt = clientUserExtService.getOne(new LambdaQueryWrapper() + .eq(ClientUserExt::getUserId,loginId) .eq(ClientUserExt::getSourceFromType, ClientUserSourceFromTypeEnum.SYSTEM_REGISTER.getValue())); - // 不为空，则判断邮箱是否为空 - if(ObjectUtil.isNotEmpty(clientUserExt)){ - // 邮箱为空，判断系统注册后是否需要绑定邮箱 - if(ObjectUtil.isEmpty(clientUser.getEmail())) { - String registerNeedBindEmail = devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_REGISTER_NEED_BIND_EMAIL_FOR_C_KEY); - if(ObjectUtil.isNotEmpty(registerNeedBindEmail)){ - return Convert.toBool(registerNeedBindEmail); - } else { - return false; - } - } else { - return false; - } - } else { - return false; - } + // 判断是否需要绑定邮箱 + return ObjectUtil.isNotEmpty(clientUserExt) + && ObjectUtil.isEmpty(clientUser.getEmail()) + ? Convert.toBool(devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_REGISTER_NEED_BIND_EMAIL_FOR_C_KEY), false) + : false; } @Override diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java index ad3a6a82..733555f6 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -2253,52 +2253,36 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public Boolean isUserNeedBindPhone() { + // 获取当前用户id + String loginId = StpUtil.getLoginIdAsString(); // 获取当前用户 - SysUser sysUser = this.queryEntity(StpUtil.getLoginIdAsString()); + SysUser sysUser = this.queryEntity(loginId); // 查询当前用户是否注册的 - SysUserExt sysUserExt = sysUserExtService.getOne(new LambdaQueryWrapper().eq(SysUserExt::getUserId, StpUtil.getLoginIdAsString()) + SysUserExt sysUserExt = sysUserExtService.getOne(new LambdaQueryWrapper() + .eq(SysUserExt::getUserId, loginId) .eq(SysUserExt::getSourceFromType, SysUserSourceFromTypeEnum.SYSTEM_REGISTER.getValue())); - // 不为空，则判断手机号是否为空 - if(ObjectUtil.isNotEmpty(sysUserExt)){ - // 手机号为空，判断系统注册后是否需要绑定手机号 - if(ObjectUtil.isEmpty(sysUser.getPhone())) { - String registerNeedBindPhone = devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_REGISTER_NEED_BIND_PHONE_FOR_B_KEY); - if(ObjectUtil.isNotEmpty(registerNeedBindPhone)){ - return Convert.toBool(registerNeedBindPhone); - } else { - return false; - } - } else { - return false; - } - } else { - return false; - } + // 判断是否需要绑定手机号 + return ObjectUtil.isNotEmpty(sysUserExt) + && ObjectUtil.isEmpty(sysUser.getPhone()) + ? Convert.toBool(devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_REGISTER_NEED_BIND_PHONE_FOR_B_KEY), false) + : false; } @Override public Boolean isUserNeedBindEmail() { + // 获取当前用户id + String loginId = StpUtil.getLoginIdAsString(); // 获取当前用户 - SysUser sysUser = this.queryEntity(StpUtil.getLoginIdAsString()); + SysUser sysUser = this.queryEntity(loginId); // 查询当前用户是否注册的 - SysUserExt sysUserExt = sysUserExtService.getOne(new LambdaQueryWrapper().eq(SysUserExt::getUserId, StpUtil.getLoginIdAsString()) + SysUserExt sysUserExt = sysUserExtService.getOne(new LambdaQueryWrapper() + .eq(SysUserExt::getUserId, loginId) .eq(SysUserExt::getSourceFromType, SysUserSourceFromTypeEnum.SYSTEM_REGISTER.getValue())); - // 不为空，则判断邮箱是否为空 - if(ObjectUtil.isNotEmpty(sysUserExt)){ - // 邮箱为空，判断系统注册后是否需要绑定邮箱 - if(ObjectUtil.isEmpty(sysUser.getEmail())) { - String registerNeedBindEmail = devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_REGISTER_NEED_BIND_EMAIL_FOR_B_KEY); - if(ObjectUtil.isNotEmpty(registerNeedBindEmail)){ - return Convert.toBool(registerNeedBindEmail); - } else { - return false; - } - } else { - return false; - } - } else { - return false; - } + // 判断是否需要绑定邮箱 + return ObjectUtil.isNotEmpty(sysUserExt) + && ObjectUtil.isEmpty(sysUser.getEmail()) + ? Convert.toBool(devConfigApi.getValueByKey(SNOWY_SYS_DEFAULT_REGISTER_NEED_BIND_EMAIL_FOR_B_KEY), false) + : false; } /**