Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

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<DsTaskingMapper, DsTas
 		List<DsTaskingVO> dsTaskingList = baseMapper.selectDisposeList(page, dsTasking);
 		if(!CollectionUtils.isEmpty(dsTaskingList)){
 			for (DsTaskingVO dsTaskingVO : dsTaskingList) {
+				if(org.apache.commons.lang3.StringUtils.isNotEmpty(dsTaskingVO.getCraftMan())){
+					// 安全获取用户名称
+					try {
+						R<UserInfo> 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);