页面修改

Edu.Repository/User/RB_AccountRepository.cs

@@ -273,15 +273,15 @@ WHERE 1=1 {0}
 SELECT count(0)
 FROM 
 (
-		SELECT A.*,IFNULL(B.MName,'') AS AccountName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id
+		SELECT A.Id
 		FROM rb_account AS A INNER JOIN rb_manager AS B ON A.AccountId=B.MId AND A.AccountType=1
 		WHERE 1=1 {0}
 		UNION ALL
-		SELECT A.*,IFNULL(B.TeacherName,'') AS AccountName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id
+		SELECT A.Id
 		FROM rb_account AS A INNER JOIN rb_teacher AS B ON A.AccountId=B.TId AND A.AccountType=2
 		WHERE 1=1 {0}
 		UNION ALL
-		SELECT A.*,IFNULL(B.AssistName,'') AS AccountName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id
+		SELECT A.Id
 		FROM rb_account AS A INNER JOIN rb_assist AS B ON A.AccountId=B.AId AND A.AccountType=3
 		WHERE 1=1 {0}
  
@@ -502,15 +502,18 @@ SELECT A.Id,A.Account,A.Group_Id,A.School_Id,A.EmployeeName,A.UserIcon,A.Account
       ,IFNULL(d.DeptId,0) AS Dept_Id,IFNULL(d.DeptName,'') AS DeptName,IFNULL(p.PostId,0) AS Post_Id, IFNULL(p.PostName,'') AS PostName
 FROM 
 (
-		SELECT A.*,IFNULL(B.MName,'') AS EmployeeName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id
+		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`
+              ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.MName,'') AS EmployeeName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id
 		FROM rb_account AS A INNER JOIN rb_manager AS B 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
+		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`
+              ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.TeacherName,'') AS EmployeeName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id
 		FROM rb_account AS A INNER JOIN rb_teacher AS B 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
+		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`
+              ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.AssistName,'') AS EmployeeName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id
 		FROM rb_account AS A INNER JOIN rb_assist AS B ON A.AccountId=B.AId AND A.AccountType=3
 		WHERE 1=1 {0}
 ) AS A LEFT JOIN rb_group AS g ON A.Group_Id=g.GId
@@ -570,8 +573,9 @@ WHERE 1=1
         /// <returns></returns>
         public List<RB_Employee_Extend> GetOKRUserNotObjectiveList(int GroupId)
         {
-            string sql = $@"SELECT e.* FROM rb_employee e
-LEFT JOIN rb_okr_objective o on e.EmployeeId = o.CreateBy AND o.`Status` in(1,2)
+            string sql = $@"
+SELECT e.* 
+FROM rb_employee e LEFT JOIN rb_okr_objective o on e.EmployeeId = o.CreateBy AND o.`Status` in(1,2)
 WHERE e.RB_Group_id ={GroupId} AND e.IsLeave =0 AND o.Id is null";
             return Get<RB_Employee_Extend>(sql).ToList();
         }
@@ -583,8 +587,9 @@ WHERE e.RB_Group_id ={GroupId} AND e.IsLeave =0 AND o.Id is null";
         /// <returns></returns>
         public List<RB_Employee_Extend> GetOKRUserNotScoreList(int GroupId)
         {
-            string sql = $@"SELECT e.* FROM rb_employee e
-LEFT JOIN rb_okr_objective o on e.EmployeeId = o.CreateBy AND o.`Status` =2
+            string sql = $@"
+SELECT e.* 
+FROM rb_employee e LEFT JOIN rb_okr_objective o on e.EmployeeId = o.CreateBy AND o.`Status` =2
 WHERE e.RB_Group_id ={GroupId} AND e.IsLeave =0 AND o.Score =0 GROUP BY e.EmployeeId";
             return Get<RB_Employee_Extend>(sql).ToList();
         }