From ae4efc8e733fab4ff040c469ecd4f9a9d9a831a2 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Tue, 10 Mar 2026 20:06:44 +0800 Subject: [PATCH] =?UTF-8?q?feat(user):=20=E6=B7=BB=E5=8A=A0=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=9B=B4=E6=96=B0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=A4=B4=E5=83=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/basic/info/command/UserUpdateExe.java | 12 +++++++++--- .../basic/info/command/query/UserQueryExe.java | 4 +++- .../basic/info/persistence/mapper/UserMapper.java | 2 ++ .../info/persistence/repository/UserRepository.java | 2 ++ .../repository/impl/UserRepositoryImpl.java | 6 ++++++ .../src/main/resources/mapper/UserMapper.xml | 3 +++ 6 files changed, 25 insertions(+), 4 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java index 3d93cf20..8c1f083e 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java @@ -260,9 +260,15 @@ public class UserUpdateExe { @Transactional(rollbackFor = Exception.class) public Boolean updateUserFaceUrl(UserUpdateFaceUrlCmd cmd) { - UserDO userDO = new UserDO(); - BeanUtils.copyProperties(cmd, userDO); - return userRepository.updateFaceUrl(userDO); + UserDO userDO = userRepository.getInfoById(cmd.getId()); + if (userDO == null) { + throw new BizException("未找到该用户"); + } + userRepository.updateFaceByPhone(cmd.getUserAvatarUrl(),userDO.getPhone()); +// UserDO userDO = new UserDO(); +// BeanUtils.copyProperties(cmd, userDO); +// return userRepository.updateFaceUrl(userDO); + return true; } @Transactional(rollbackFor = Exception.class) diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java index cbfb778e..c59e4ec0 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java @@ -15,6 +15,7 @@ import com.zcloud.basic.info.command.convertor.CorpInfoCoConvertor; import com.zcloud.basic.info.command.convertor.UserCoConvertor; import com.zcloud.basic.info.constant.RedisConstant; import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum; +import com.zcloud.basic.info.domain.enums.UserTypeEnum; import com.zcloud.basic.info.domain.gateway.UserGateway; import com.zcloud.basic.info.domain.model.UserE; import com.zcloud.basic.info.dto.*; @@ -268,7 +269,8 @@ public class UserQueryExe { throw new BizException("用户不存在"); } //获取在职的用户取第一个 - UserDO userDO = userDOList.stream().filter(userDO1 -> UserEmploymentFlagEnum.ON.getCode().equals(userDO1.getEmploymentFlag())).findFirst().orElse(null); + UserDO userDO = userDOList.stream().filter(userDO1 -> UserEmploymentFlagEnum.ON.getCode().equals(userDO1.getEmploymentFlag())) + .filter(userDO1 -> UserTypeEnum.XGF.getCode().equals(userDO1.getUserType())).findFirst().orElse(null); if(userDO == null){ userDO = userDOList.get(0); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java index a7b1ea04..6a7e8a51 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java @@ -47,5 +47,7 @@ public interface UserMapper extends BaseMapper { UserDO getUserIdByPhone(String phone); IPage pageByNopermission(IPage iPage, @Param("ew") QueryWrapper queryWrapper); + + void updateFaceByPhone(String userAvatarUrl, String phone); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java index 874879d7..54e9f631 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java @@ -98,5 +98,7 @@ public interface UserRepository extends BaseRepository { UserDO getUserIdByPhone(@NotEmpty(message = "手机号不能为空") String phone); PageResponse pageByNopermission(Map params); + + void updateFaceByPhone(@NotEmpty(message = "人脸头像url不能为空") String userAvatarUrl, String phone); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index 1d7d8cfe..b7183daf 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -698,5 +698,11 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i public UserDO getUserIdByPhone(String phone) { return userMapper.getUserIdByPhone(phone); } + + @Override + public void updateFaceByPhone(String userAvatarUrl, String phone) { + + userMapper.updateFaceByPhone(userAvatarUrl, phone); + } } diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml index 301ae437..f67f36c4 100644 --- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml @@ -538,5 +538,8 @@ + + update user set user_avatar_url = #{userAvatarUrl} where phone = #{phone} +