From 24f0caacd58894ab943e7ef9c538762ce928b7a7 Mon Sep 17 00:00:00 2001 From: chenyouting <514333061@qq.com> Date: Sat, 12 Jul 2025 09:52:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E8=93=9D=E7=89=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/model/PasswordLoginBody.java | 4 ++-- .../com/fuyuanshen/app/service/impl/AppUserServiceImpl.java | 4 ++++ .../fuyuanshen/equipment/service/impl/DeviceServiceImpl.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/PasswordLoginBody.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/PasswordLoginBody.java index 1ba0e32..310c175 100644 --- a/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/PasswordLoginBody.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/PasswordLoginBody.java @@ -18,14 +18,14 @@ public class PasswordLoginBody extends LoginBody { * 用户名 */ @NotBlank(message = "{user.username.not.blank}") - @Length(min = 2, max = 30, message = "{user.username.length.valid}") +// @Length(min = 2, max = 30, message = "{user.username.length.valid}") private String username; /** * 用户密码 */ @NotBlank(message = "{user.password.not.blank}") - @Length(min = 5, max = 30, message = "{user.password.length.valid}") +// @Length(min = 5, max = 30, message = "{user.password.length.valid}") private String password; } diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppUserServiceImpl.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppUserServiceImpl.java index 7d3483f..69c25f5 100644 --- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppUserServiceImpl.java +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppUserServiceImpl.java @@ -163,6 +163,10 @@ public class AppUserServiceImpl implements IAppUserService { appUserVo.setNickName(user.getNickName()); appUserVo.setGender(user.getSex()); appUserVo.setPhone(user.getPhonenumber()); + SysOssVo oss = sysOssService.getById(user.getAvatar()); + if(oss != null){ + appUserVo.setAvatarPath(oss.getUrl()); + } return appUserVo; } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java index 61799d5..2cfe856 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java @@ -547,7 +547,7 @@ public class DeviceServiceImpl extends ServiceImpl impleme deviceUpdateWrapper.eq("id", device.getId()) .set("binding_status", BindingStatusEnum.BOUND.getCode()) .set("binding_user_id", userId); - return baseMapper.update(null, qw); + return baseMapper.update(null, deviceUpdateWrapper); } else { throw new RuntimeException("通讯方式错误"); }