Merge remote-tracking branch 'origin/dev_4newlayout' into dev_4newlayout

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java

@@ -296,6 +296,12 @@ public class TaskController extends JeecgController<Task, ITaskService> {
                     e.setUpperTaskName(taskUpper.getTaskName());
                 }
             }
+            if (StringUtils.isNotBlank(e.getTypeId())) {
+                TaskType taskType = taskTypeService.getById(e.getTypeId());
+                if (ObjectUtils.isNotEmpty(taskType)) {
+                    e.setTypePid(taskType.getPid());
+                }
+            }
             if (e.getTaskFile() != null && !e.getTaskFile().equals("")) {
                 e.setContentType("file");
             } else if (e.getTaskPic() != null && !e.getTaskPic().equals("")) {