diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java index bad46d12..ae1e97e8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java @@ -180,13 +180,17 @@ public class OemController extends BladeController { if(null != craft){ BeanUtils.copyProperties(craft,team); - R user= iUserClient.userInfoById(craft.getDispatcher()); - if(null != user && null != user.getData()){ - team.setDispatcherName(user.getData().getRealName()); + if(null != craft.getDispatcher()){ + R user= iUserClient.userInfoById(craft.getDispatcher()); + if(null != user && null != user.getData()){ + team.setDispatcherName(user.getData().getRealName()); + } } - R userplan= iUserClient.userInfoById(craft.getPlanner()); - if(null != userplan && null != userplan.getData()){ - team.setPlannerName(userplan.getData().getRealName()); + if(null != craft.getPlanner()){ + R userplan= iUserClient.userInfoById(craft.getPlanner()); + if(null != userplan && null != userplan.getData()){ + team.setPlannerName(userplan.getData().getRealName()); + } } }