Merge remote-tracking branch 'origin/main'

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();
+        UserDO userDO = userRepository.getInfoById(cmd.getId());
-        BeanUtils.copyProperties(cmd, userDO);
+        if (userDO == null) {
-        return userRepository.updateFaceUrl(userDO);
+            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)

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);
         }

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java

@@ -47,5 +47,7 @@ public interface UserMapper extends BaseMapper<UserDO> {
     UserDO getUserIdByPhone(String phone);
 
     IPage<UserDO> pageByNopermission(IPage<UserDO> iPage, @Param("ew") QueryWrapper<UserDO> queryWrapper);
+
+    void updateFaceByPhone(String userAvatarUrl, String phone);
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java

@@ -98,5 +98,7 @@ public interface UserRepository extends BaseRepository<UserDO> {
     UserDO getUserIdByPhone(@NotEmpty(message = "手机号不能为空") String phone);
 
     PageResponse<UserDO> pageByNopermission(Map<String, Object> params);
+
+    void updateFaceByPhone(@NotEmpty(message = "人脸头像url不能为空") String userAvatarUrl, String phone);
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java

@@ -698,5 +698,11 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
     public UserDO getUserIdByPhone(String phone) {
        return userMapper.getUserIdByPhone(phone);
     }
+
+    @Override
+    public void updateFaceByPhone(String userAvatarUrl, String phone) {
+
+       userMapper.updateFaceByPhone(userAvatarUrl, phone);
+    }
 }
 

web-infrastructure/src/main/resources/mapper/UserMapper.xml

@@ -540,5 +540,8 @@
     <select id="getUserIdByPhone"  resultType="com.zcloud.basic.info.persistence.dataobject.UserDO">
         select * from user where phone =  #{phone} limit 1;
     </select>
+    <update id="updateFaceByPhone">
+        update user set user_avatar_url = #{userAvatarUrl} where phone = #{phone}
+    </update>
 </mapper>