Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Model/Entity/User/RB_Department.cs

@@ -66,10 +66,19 @@ namespace Edu.Model.Entity.User
 		/// </summary>
 		public DateTime UpdateTime { get; set; }
 
-		/// <summary>
-		/// 校区编号
-		/// </summary>
-		public int School_Id { get; set; }
+        /// <summary>
+        /// 校区默认值
+        /// </summary>
+        private int defaultSId = -1;
+
+        /// <summary>
+        /// 学校编号
+        /// </summary>
+        public int School_Id
+        {
+            get { return defaultSId; }
+            set { defaultSId = value; }
+        }
 
 		/// <summary>
 		/// 部门层级

Edu.Module.Course/SellCommissionModule.cs

@@ -745,7 +745,7 @@ namespace Edu.Module.Course
                         #region 班级提成
                         //查询是否订单下所有学员都已退学  
                         var g2list = glist.Where(x => x.OrderId == item.OrderId).ToList();
-                        if (g2list.Where(x => x.GuestState == 2).Count() == item.GuestNum)
+                        if (g2list.Where(x => x.GuestState == -1).Count() == item.GuestNum)
                         {
                             //所有学生都退学了   直接计算提成  全部一次性发放
                             if (item.HelpEnterId > 0)