This commit is contained in:
张良(004796)
2024-02-01 19:06:22 +08:00
parent ae6409aa21
commit 0baa0cfb7a
12 changed files with 174 additions and 32 deletions

View File

@@ -26,7 +26,6 @@ import com.ruoyi.yunxin.client.ImUserRefClient;
import com.ruoyi.yunxin.req.UpdateUinfoReq;
import com.ruoyi.yunxin.resp.YxCommonR;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -77,6 +76,7 @@ public class CurrentUserManager {
Long userId = LoginHelper.getUserId();
User user = userService.getById(userId);
CurrentUserUpdateInfoVo res = BeanConvertUtil.convertTo(user, CurrentUserUpdateInfoVo::new);
res.setUserId(user.getId());
UserPictureAudit audit = userPictureAuditService.getOneUserAuditRunningPic(UserPictureAuditType.AVATAR.getCode(), res.getUserId());
CurrentUserUpdateInfoVo.Avatar avatar = new CurrentUserUpdateInfoVo.Avatar();
if(audit == null){
@@ -260,6 +260,11 @@ public class CurrentUserManager {
save.setAuditStatus(AuditStatusEnum.AUDITING.getCode());
userPictureAuditService.save(save);
vo.setAuditStatus(AuditStatusEnum.AUDITING.getCode());
} else {
userService.update(Wrappers.lambdaUpdate(User.class)
.eq(User::getId, res.getUserId())
.set(User::getAvatar, res.getAvatar())
.set(User::getAvatarState, 1));
}
vo.setAuditStatus(AuditStatusEnum.SUCCESS.getCode());
return vo;