diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java index e1666e17..be8d74f1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java @@ -58,6 +58,7 @@ import org.springblade.scheduling.pojo.entity.CraftAbilityEntity; import org.springblade.scheduling.pojo.entity.WorkOrderEntity; import org.springblade.scheduling.pojo.entity.WorkPlanEntity; import org.springblade.system.feign.IUserClient; +import org.springblade.system.pojo.entity.User; import org.springblade.system.pojo.entity.UserInfo; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -493,6 +494,21 @@ public class DsTaskingServiceImpl extends BaseServiceImpl dsTaskingList = baseMapper.selectDisposeList(page, dsTasking); if(!CollectionUtils.isEmpty(dsTaskingList)){ for (DsTaskingVO dsTaskingVO : dsTaskingList) { + if(org.apache.commons.lang3.StringUtils.isNotEmpty(dsTaskingVO.getCraftMan())){ + // 安全获取用户名称 + try { + R userInfoR = userClient.userInfo(Func.toLong(dsTaskingVO.getCraftMan())); + if (userInfoR != null && userInfoR.getData() != null) { + User user = userInfoR.getData().getUser(); + if (user != null) { + dsTaskingVO.setCraftMan(user.getName()); + } + } + } catch (Exception e) { + log.error("获取用户信息失败, userId: {}",dsTaskingVO.getCraftMan(), e); + } + } + String partCode = dsTaskingVO.getPartCode(); String version = dsTaskingVO.getVersion(); DsPartEntity partEntity = partService.selectDsPartByPatCodeAndVersion(partCode,version);