基础数据修改001

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> user= iUserClient.userInfoById(craft.getDispatcher());
-                        if(null != user && null != user.getData()){
-                            team.setDispatcherName(user.getData().getRealName());
+                        if(null != craft.getDispatcher()){
+                            R<User> user= iUserClient.userInfoById(craft.getDispatcher());
+                            if(null != user && null != user.getData()){
+                                team.setDispatcherName(user.getData().getRealName());
+                            }
                         }
-                        R<User> userplan= iUserClient.userInfoById(craft.getPlanner());
-                        if(null != userplan && null != userplan.getData()){
-                            team.setPlannerName(userplan.getData().getRealName());
+                        if(null != craft.getPlanner()){
+                            R<User> userplan= iUserClient.userInfoById(craft.getPlanner());
+                            if(null != userplan && null != userplan.getData()){
+                                team.setPlannerName(userplan.getData().getRealName());
+                            }
                         }
                     }