提交代码

Edu.Repository/User/RB_AccountRepository.cs

@@ -305,17 +305,23 @@ SELECT A.Id,A.Account,A.AccountId,A.Group_Id,A.School_Id,A.EmployeeName,A.UserIc
         ELSE 0 END) IsBirth    
 FROM 
 (
-		SELECT A.*,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
+		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,
+A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay,
+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
 		FROM rb_manager AS B LEFT JOIN rb_account AS A  ON A.AccountId=B.MId AND A.AccountType=1
 		WHERE 1=1 {0}
 		UNION ALL
-		SELECT A.*,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
+		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.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
 		FROM rb_teacher AS B LEFT JOIN rb_account AS A  ON A.AccountId=B.TId AND A.AccountType=2
 		WHERE 1=1 {0}
 		UNION ALL
-		SELECT A.*,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
+		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.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
 		FROM  rb_assist AS B LEFT JOIN rb_account AS A  ON A.AccountId=B.AId AND A.AccountType=3
 		WHERE 1=1 {0}

Edu.WebApi/Controllers/User/UserController.cs

@@ -636,6 +636,7 @@ namespace Edu.WebApi.Controllers.User
                 qitem.SchoolName,
                 qitem.DeptName,
                 qitem.PostName,
+                qitem.EmployeeTel,
                 Sex = qitem.Sex == 0 ? "男" : "女",
                 BirthDate = Common.ConvertHelper.FormatDate(qitem.BirthDate),
                 Education = qitem.Education.ToName(),