Merge branch 'feature/admin' into preview

master
Diyu0904 2025-03-10 14:53:09 +08:00
commit 79bb17e7f5
6 changed files with 6 additions and 7 deletions

View File

@ -134,7 +134,7 @@ public class ModelImageLikeServiceImpl extends ServiceImpl<ModelImageLikeMapper,
page.setTotal(page.getTotal() - 1);
continue;
}
modelImageLikeVo.setUserName(sysUser.getUserName());
modelImageLikeVo.setUserName(sysUser.getNickName());
modelImageLikeVo.setUserAvatar(sysUser.getAvatar());
// 获取图片信息

View File

@ -26,7 +26,6 @@ import com.mcwl.system.service.ISysDictDataService;
import com.mcwl.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
@ -256,7 +255,7 @@ public class ModelImageServiceImpl extends ServiceImpl<ModelImageMapper, ModelIm
SysUser sysUser = sysUserService.selectUserById(modelImage.getUserId());
modelImageVo.setUserId(sysUser.getUserId());
modelImageVo.setUserName(sysUser.getUserName());
modelImageVo.setUserName(sysUser.getNickName());
modelImageVo.setUserAvatar(sysUser.getAvatar());
return modelImageVo;
}

View File

@ -105,7 +105,7 @@ public class ModelLikeServiceImpl extends ServiceImpl<ModelLikeMapper, ModelLike
page.setTotal(page.getTotal() - 1);
continue;
}
modelLikeVo.setUserName(sysUser.getUserName());
modelLikeVo.setUserName(sysUser.getNickName());
modelLikeVo.setUserAvatar(sysUser.getAvatar());
// 获取模型信息

View File

@ -216,7 +216,7 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
continue;
}
modelVo.setUserId(sysUser.getUserId());
modelVo.setUserName(sysUser.getUserName());
modelVo.setUserName(sysUser.getNickName());
modelVo.setUserAvatar(sysUser.getAvatar());
modelVoList.add(modelVo);
}

View File

@ -112,7 +112,7 @@ public class WorkFlowLikeServiceImpl extends ServiceImpl<WorkFlowLikeMapper, Wor
page.setTotal(page.getTotal() - 1);
continue;
}
workFlowLikeVo.setUserName(sysUser.getUserName());
workFlowLikeVo.setUserName(sysUser.getNickName());
workFlowLikeVo.setUserAvatar(sysUser.getAvatar());
// 获取工作流信息

View File

@ -424,7 +424,7 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
continue;
}
workFlowVo.setUserId(sysUser.getUserId());
workFlowVo.setUserName(sysUser.getUserName());
workFlowVo.setUserName(sysUser.getNickName());
workFlowVo.setUserAvatar(sysUser.getAvatar());
workFlowVoList.add(workFlowVo);
}