diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java index ab8839f..bcd1892 100644 --- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java @@ -23,4 +23,8 @@ public class AppFileVo { * 文件url */ private String fileUrl; + /** + * 文件类型(1:操作说明,2:产品参数) + */ + private Long fileType; } 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 44833cf..a50ec9a 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 @@ -172,6 +172,7 @@ public class AppUserServiceImpl implements IAppUserService { appUserVo.setNickName(user.getNickName()); appUserVo.setGender(user.getSex()); appUserVo.setPhone(user.getPhonenumber()); + appUserVo.setRegion(user.getRegion()); if(user.getAvatar() != null){ SysOssVo oss = sysOssService.getById(user.getAvatar()); if(oss != null){ @@ -192,8 +193,11 @@ public class AppUserServiceImpl implements IAppUserService { AppUser updUser= new AppUser(); updUser.setUserId(appUser.getUserId()); updUser.setNickName(bo.getNickName()); - SysOssVo oss = sysOssService.upload(bo.getFile()); - updUser.setAvatar(oss.getOssId()); + if(bo.getFile() != null){ + SysOssVo oss = sysOssService.upload(bo.getFile()); + updUser.setAvatar(oss.getOssId()); + } + updUser.setRegion(bo.getRegion()); updUser.setSex(bo.getGender()); return baseMapper.update(updUser, new LambdaQueryWrapper().eq(AppUser::getUserId, appUser.getUserId())); diff --git a/fys-modules/fys-app/src/main/resources/mapper/app/AppBusinessFileMapper.xml b/fys-modules/fys-app/src/main/resources/mapper/app/AppBusinessFileMapper.xml index ffd045d..cf567b9 100644 --- a/fys-modules/fys-app/src/main/resources/mapper/app/AppBusinessFileMapper.xml +++ b/fys-modules/fys-app/src/main/resources/mapper/app/AppBusinessFileMapper.xml @@ -5,16 +5,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"