From 9c244824d34a5dea6f43aabe758ed673948db256 Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Tue, 31 Mar 2026 10:05:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/dashboard/service/impl/DsTaskingServiceImpl.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 be8d74f1..24d9af48 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
@@ -488,8 +488,8 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 			dsTasking.setTaskStatusList(list);
 		}
 		String roleName = AuthUtil.getUser().getRoleName();
-		if("craftMan".equals(roleName)){
-			dsTasking.setCraftMan(AuthUtil.getUser().getNickName());
+		if("rb_craft".equals(roleName) || "sj_craft".equals(roleName)){
+			dsTasking.setCraftMan(AuthUtil.getUser().getUserId().toString());
 		};
 		List<DsTaskingVO> dsTaskingList = baseMapper.selectDisposeList(page, dsTasking);
 		if(!CollectionUtils.isEmpty(dsTaskingList)){
@@ -501,7 +501,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 						if (userInfoR != null && userInfoR.getData() != null) {
 							User user = userInfoR.getData().getUser();
 							if (user != null) {
-								dsTaskingVO.setCraftMan(user.getName());
+								dsTaskingVO.setCraftMan(user.getRealName());
 							}
 						}
 					} catch (Exception e) {