Merge branch '西昌分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessBLL.cs

@@ -773,7 +773,7 @@ namespace Learun.Application.WorkFlow
                                     var parentDepart = departmentIBLL.GetEntity(selfDepart.F_ParentId);
                                     if (parentDepart != null)
                                     {
-                                        if (!string.IsNullOrEmpty(selfDepart.F_SchoolMasterId))
+                                        if (!string.IsNullOrEmpty(parentDepart.F_SchoolMasterId))
                                         {
                                             schoolMasterId = parentDepart.F_SchoolMasterId;
                                         }
@@ -815,7 +815,7 @@ namespace Learun.Application.WorkFlow
                                     var parentDepart = departmentIBLL.GetEntity(selfDepart2.F_ParentId);
                                     if (parentDepart != null)
                                     {
-                                        if (!string.IsNullOrEmpty(selfDepart2.F_Manager))
+                                        if (!string.IsNullOrEmpty(parentDepart.F_Manager))
                                         {
                                             deptMasterId = parentDepart.F_Manager;
                                         }