用户无部门创建任务

quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java

@@ -116,7 +116,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
         Task task = new Task();
         task.setTaskInitiatorId(loginUser.getUserId());
         task.setTaskInitiator(initiator.getNickName());
-        if (initiator.getDept().getDeptName() != null) {
+        if (initiator.getDept() != null) {
             task.setTaskInitiatorDept(initiator.getDept().getDeptName());
         }
         task.setTaskStatus(Task.TASK_STATUS_NEW);
@@ -690,7 +690,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
         SystemReviewTask task = new SystemReviewTask()
                 .setTaskNo(request.getTaskNo())
                 .setTaskInitiator(initiator.getNickName())
-                .setTaskInitiatorDept(initiator.getDept().getDeptName())
                 .setTaskStatus(SystemReviewTask.STATUS_NEW)
                 .setLeaderId(leader.getUserId())
                 .setLeader(leader.getName())
@@ -700,6 +699,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
                 .setStandardNo(standard.getStandardNo())
                 .setFile(standard.getFile());
 
+        if (initiator.getDept() != null) {
+            task.setTaskInitiatorDept(initiator.getDept().getDeptName());
+        }
+
         systemReviewTaskService.save(task);
         return task.getId();
     }
@@ -712,7 +715,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
         CarReviewTask task = new CarReviewTask()
                 .setTaskNo(request.getTaskNo())
                 .setTaskInitiator(initiator.getNickName())
-                .setTaskInitiatorDept(initiator.getDept().getDeptName())
                 .setTaskStatus(CarReviewTask.TASK_STATUS_NEW)
                 .setLeaderId(leader.getUserId())
                 .setLeader(leader.getName())
@@ -722,6 +724,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
                 .setStandardNo(standard.getStandardNo())
                 .setFile(standard.getFile());
 
+        if (initiator.getDept() != null) {
+            task.setTaskInitiatorDept(initiator.getDept().getDeptName());
+        }
+
         carReviewTaskService.save(task);
         return task.getId();
     }