页面修改

Edu.Repository/User/RB_AccountRepository.cs

@@ -294,7 +294,7 @@ FROM
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
 SELECT ar.AccountRemark,A.Id,A.Account,A.AccountId,A.Group_Id,A.School_Id,A.EmployeeName,A.UserIcon,A.IDCard,A.Sex,A.Education,A.EntryTime,A.Address,A.BirthDate
-      ,A.LeaveStatus,A.LeaveTime,A.EmployeeTel,A.AccountType
+      ,A.LeaveStatus,A.LeaveTime,A.EmployeeTel,A.AccountType,A.Email
       ,IFNULL(G.GroupName,'') AS GroupName,IFNULL(s.SName,'') AS SchoolName
       ,IFNULL(d.DeptId,0) AS Dept_Id,IFNULL(d.DeptName,'') AS DeptName,IFNULL(p.PostId,0) AS Post_Id, IFNULL(p.PostName,'') AS PostName
       ,(CASE  WHEN CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(BirthDate,'%m-%d')) >= DATE_FORMAT(now(),'%Y-%m-%d')  
@@ -311,17 +311,19 @@ FROM
 		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
-		SELECT A.Id,A.Account,A.`Password`, 2 as AccountType,B.TId as AccountId,
-A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay,
-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
+		SELECT A.Id,A.Account,A.`Password`, 2 as AccountType,B.TId as AccountId
+              ,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay
+              ,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
 		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
-		SELECT A.Id,A.Account,A.`Password`, 3 as AccountType,B.AId as AccountId,
-A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay,
-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
+		SELECT A.Id,A.Account,A.`Password`, 3 as AccountType,B.AId as AccountId
+              ,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay
+              ,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
 		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

Edu.WebApi/Controllers/User/UserController.cs

@@ -689,7 +689,8 @@ namespace Edu.WebApi.Controllers.User
                 qitem.School_Id,
                 qitem.Group_Id,
                 qitem.Dept_Id,
-                qitem.AccountRemark
+                qitem.AccountRemark,
+                qitem.Email,
             });
             return ApiResult.Success(data: pageModel);
         }
@@ -752,8 +753,6 @@ namespace Edu.WebApi.Controllers.User
         }
 
 
-
-
         /// <summary>
         /// 修改员工的部门
         /// </summary>
@@ -762,7 +761,6 @@ namespace Edu.WebApi.Controllers.User
         public ApiResult UpdateEmployeeDept()
         {
             var extModel = Common.Plugin.JsonHelper.DeserializeObject<Employee_ViewModel>(RequestParm.Msg.ToString());
-
             extModel.UpdateBy = base.UserInfo.Id;
             extModel.UpdateTime = DateTime.Now;
             extModel.Group_Id = base.UserInfo.Group_Id;
@@ -781,7 +779,6 @@ namespace Edu.WebApi.Controllers.User
         public ApiResult UpdateEmployeePost()
         {
             var extModel = Common.Plugin.JsonHelper.DeserializeObject<Employee_ViewModel>(RequestParm.Msg.ToString());
-
             extModel.UpdateBy = base.UserInfo.Id;
             extModel.UpdateTime = DateTime.Now;
             extModel.Group_Id = base.UserInfo.Group_Id;
@@ -904,7 +901,7 @@ namespace Edu.WebApi.Controllers.User
                 SexStr = (extModel?.Sex ?? 0) == 0 ? "男" : "女",
                 UserIcon = extModel?.UserIcon ?? "",
                 Status = extModel?.Status ?? 0,
-
+                Email=extModel?.Email??"",
             };
             return ApiResult.Success(data: obj);
         }