暂存

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) {