页面修改

Edu.Model/Entity/User/RB_Manager.cs

@@ -121,5 +121,10 @@ namespace Edu.Model.Entity.User
 		/// 邮箱
 		/// </summary>
 		public string Email { get; set; }
+
+		/// <summary>
+		/// 用户角色(1-市场人员，2-课程顾问)
+		/// </summary>
+		public UserRoleEnum UserRole { get; set; }
 	}
 }

Edu.Model/Entity/User/RB_Teacher.cs

@@ -202,5 +202,10 @@ namespace Edu.Model.Entity.User
         /// 启用时间 (存到月)
         /// </summary>
         public string EnableTime { get; set; }
+
+        /// <summary>
+		/// 用户角色(1-市场人员，2-课程顾问)
+		/// </summary>
+		public UserRoleEnum UserRole { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/User/Employee_ViewModel.cs

@@ -206,5 +206,10 @@ namespace Edu.Model.ViewModel.User
         /// 企业微信用户Ids
         /// </summary>
         public string WorkUserIds { get; set; }
+
+        /// <summary>
+        /// 用户角色(1-市场人员，2-课程顾问)
+        /// </summary>
+        public UserRoleEnum UserRole { get; set; }
     }
 }

Edu.Module.User/EmployeeModule.cs

@@ -187,7 +187,8 @@ namespace Edu.Module.User
                         DirectSupervisor = extModel.DirectSupervisor,
                         ManagerAccount = extModel.Account,
                         Password = extModel.Password,
-                        Token = token
+                        Token = token,
+                        UserRole=extModel.UserRole,
                     });
                     break;
                 case Common.Enum.User.AccountTypeEnum.Teacher:
@@ -218,7 +219,8 @@ namespace Edu.Module.User
                         DirectSupervisor = extModel.DirectSupervisor,
                         TeacherAccount=extModel.Account,
                         Password=extModel.Password,
-                        Token = token
+                        Token = token,
+                        UserRole = extModel.UserRole,
                     });
                     break;
                 case Common.Enum.User.AccountTypeEnum.Assist:

Edu.Module.User/ManagerModule.cs

@@ -115,6 +115,7 @@ namespace Edu.Module.User
                     { nameof(RB_Manager_ViewModel.LeaveTime),model.LeaveTime },
                     { nameof(RB_Manager_ViewModel.Education),model.Education },
                     { nameof(RB_Manager_ViewModel.Email),model.Email },
+                    { nameof(RB_Manager_ViewModel.UserRole),model.UserRole },
                 };
 
                 #region 日志
@@ -163,6 +164,10 @@ namespace Edu.Module.User
                 {
                     logContent += string.Format(",将邮箱由【{0}】修改为【{1}】。", oldModel.Email, model.Email);
                 }
+                if (model.UserRole != oldModel.UserRole)
+                {
+                    logContent += string.Format(",用户角色由【{0}】修改为【{1}】。", oldModel.UserRole.ToName(), model.UserRole.ToName());
+                }
                 if (!string.IsNullOrEmpty(logContent))
                 {
                     //新增日志

Edu.Module.User/TeacherModule.cs

@@ -180,6 +180,7 @@ namespace Edu.Module.User
                     fileds.Add(nameof(RB_Teacher_ViewModel.LeaveTime), model.LeaveTime);
                     fileds.Add(nameof(RB_Teacher_ViewModel.Education), model.Education);
                     fileds.Add(nameof(RB_Teacher_ViewModel.Email), model.Email);
+                    fileds.Add(nameof(RB_Teacher_ViewModel.UserRole), model.UserRole);
                 }
                 #region 修改日志
                 string logContent = "";
@@ -239,6 +240,10 @@ namespace Edu.Module.User
                 {
                     logContent += string.Format(",将基础带班人数由【{0}】修改为【{1}】。", oldModel.BaseStuNum, model.BaseStuNum);
                 }
+                if (model.UserRole != oldModel.UserRole)
+                {
+                    logContent += string.Format(",将用户角色由【{0}】修改为【{1}】。", oldModel.UserRole, model.UserRole);
+                }
                 if (!string.IsNullOrEmpty(logContent))
                 {
                     //新增日志

Edu.Repository/User/RB_AccountRepository.cs

@@ -480,7 +480,7 @@ FROM
                ,b.School_Id,IFNULL(B.MName,'') AS EmployeeName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard
                ,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
                ,B.LeaveStatus,B.LeaveTime,B.MTel AS EmployeeTel,IFNULL(B.Email,'') AS Email
-               ,0 as BaseHourFee,0 as BaseHoursEnabled,'' as EnableTime
+               ,0 as BaseHourFee,0 as BaseHoursEnabled,'' as EnableTime,B.UserRole
 		FROM rb_manager AS B LEFT JOIN rb_account AS A  ON A.AccountId=B.MId AND A.AccountType=1
 		WHERE 1=1 {0} {1}
 		UNION ALL
@@ -489,7 +489,7 @@ FROM
               ,b.School_Id,IFNULL(B.TeacherName,'') AS EmployeeName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard
               ,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
               ,B.LeaveStatus,B.LeaveTime,B.TeacherTel AS EmployeeTel,IFNULL(B.Email,'') AS Email
-              ,B.BaseHourFee,B.BaseHoursEnabled,B.EnableTime
+              ,B.BaseHourFee,B.BaseHoursEnabled,B.EnableTime,B.UserRole
 		FROM rb_teacher AS B LEFT JOIN rb_account AS A  ON A.AccountId=B.TId AND A.AccountType=2
 		WHERE 1=1 {0} {2}
 		UNION ALL
@@ -498,7 +498,7 @@ FROM
               ,b.School_Id,IFNULL(B.AssistName,'') AS EmployeeName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard
               ,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
               ,B.LeaveStatus,B.LeaveTime,B.AssistTel AS EmployeeTel,IFNULL(B.Email,'') AS Email
-              ,0 as BaseHourFee,0 as BaseHoursEnabled,'' as EnableTime
+              ,0 as BaseHourFee,0 as BaseHoursEnabled,'' as EnableTime,0 AS UserRole
 		FROM  rb_assist AS B LEFT JOIN rb_account AS A  ON A.AccountId=B.AId AND A.AccountType=3  
 		WHERE 1=1 {0} {3}
 ) AS A LEFT JOIN rb_group AS g ON A.Group_Id=g.GId