1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserWithBeisenController.java

@@ -101,7 +101,7 @@ public class UserWithBeisenController {
                     continue;
                 }
                 userWithBeisenList.add(userWithBeisen);
-                Optional<User> user = userList.stream().filter(u -> u.getJobNumber().equals(userWithBeisen.getJobNumber())).findFirst();
+                Optional<User> user = userList.stream().filter(u ->u.getJobNumber()!=null&&u.getJobNumber().equals(userWithBeisen.getJobNumber())).findFirst();
                 if(user.isPresent()){
                     User u=new User();
                     u.setId(user.get().getId());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -2037,7 +2037,7 @@ public class TimingTask {
                                 userWithBeisen.setId(first.get().getId());
                             }
                             userWithBeisenList.add(userWithBeisen);
-                            Optional<User> user = userList.stream().filter(u -> u.getJobNumber().equals(userWithBeisen.getJobNumber())).findFirst();
+                            Optional<User> user = userList.stream().filter(u ->u.getJobNumber()!=null&&u.getJobNumber().equals(userWithBeisen.getJobNumber())).findFirst();
                             if(user.isPresent()){
                                 User u=new User();
                                 u.setId(user.get().getId());