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

Edu.Module.User/EmployeeModule.cs

@@ -115,7 +115,14 @@ namespace Edu.Module.User
         /// <returns></returns>
         public Employee_ViewModel GetEmployeeModule(int Id, int AccountId, int AccountType)
         {
-            return accountRepository.GetEmployeeListRepository(new Employee_ViewModel() { Id = Id, AccountId = AccountId, AccountType = (Common.Enum.User.AccountTypeEnum)AccountType })?.FirstOrDefault();
+            Employee_ViewModel model = new Employee_ViewModel();
+
+            var list = accountRepository.GetEmployeeListRepository(new Employee_ViewModel() { Id = Id, AccountId = AccountId, AccountType = (Common.Enum.User.AccountTypeEnum)AccountType });
+            if (list != null && list.Any())
+            {
+                model = list.Where(x => (int)x.AccountType == AccountType)?.FirstOrDefault();
+            }
+            return model;
         }
 
         /// <summary>

Edu.Repository/User/RB_AccountRepository.cs

@@ -197,6 +197,10 @@ FROM
         {
             StringBuilder where = new StringBuilder();
             StringBuilder where2 = new StringBuilder();
+
+            StringBuilder wheremanager = new StringBuilder();
+            StringBuilder whereteacher = new StringBuilder();
+            StringBuilder whereassist = new StringBuilder();
             if (query != null)
             {
                 if (query.Group_Id > 0)
@@ -211,21 +215,19 @@ FROM
                 {
                     where.AppendFormat(" AND A.{0}='{1}' ", nameof(Employee_ViewModel.Account), query.Account.Trim());
                 }
-                if (query.AccountType > 0)
-                {
-                    where.AppendFormat(" AND A.{0}={1} ", nameof(Employee_ViewModel.AccountType), (int)query.AccountType);
-                }
-                if (query.Id > 0)
-                {
-                    where.AppendFormat(" AND A.{0}={1} ", nameof(Employee_ViewModel.Id), query.Id);
-                }
+                //if (query.Id > 0)
+                //{
+                //    where.AppendFormat(" AND A.{0}={1} ", nameof(Employee_ViewModel.Id), query.Id);
+                //}
                 if (!string.IsNullOrEmpty(query.QIds))
                 {
                     where.AppendFormat(" AND A.{0} IN({1}) ", nameof(Employee_ViewModel.Id), query.QIds);
                 }
                 if (query.AccountId > 0)
                 {
-                    where.AppendFormat(" AND A.{0}={1} ", nameof(Employee_ViewModel.AccountId), query.AccountId);
+                    wheremanager.AppendFormat(" AND b.{0}={1} ", nameof(RB_Manager_ViewModel.MId), query.AccountId);
+                    whereteacher.AppendFormat(" AND b.{0}={1} ", nameof(RB_Teacher_ViewModel.TId), query.AccountId);
+                    whereassist.AppendFormat(" AND b.{0}={1} ", nameof(RB_Assist_ViewModel.AId), query.AccountId);
                 }
                 if (query.Post_Id > 0)
                 {
@@ -305,32 +307,32 @@ SELECT A.Id,A.Account,A.AccountId,A.Group_Id,A.School_Id,A.EmployeeName,A.UserIc
         ELSE 0 END) IsBirth    
 FROM 
 (
-		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,
+		SELECT A.Id,A.Account,A.`Password`, 1 as AccountType,B.MId as 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}
+		WHERE 1=1 {0} {1}
 		UNION ALL
-		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,
+		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
 		FROM rb_teacher AS B LEFT JOIN rb_account AS A  ON A.AccountId=B.TId AND A.AccountType=2
-		WHERE 1=1 {0}
+		WHERE 1=1 {0} {2}
 		UNION ALL
-		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,
+		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
 		FROM  rb_assist AS B LEFT JOIN rb_account AS A  ON A.AccountId=B.AId AND A.AccountType=3
-		WHERE 1=1 {0}
+		WHERE 1=1 {0} {3}
 ) AS A LEFT JOIN rb_group AS g ON A.Group_Id=g.GId
        LEFT JOIN rb_school AS s ON A.School_Id=s.SId
        LEFT JOIN rb_department AS d ON A.Dept_Id=d.DeptId
        LEFT JOIN rb_post AS p ON A.Post_Id=p.PostId     
-WHERE  1=1   {1}
-", where.ToString(), where2.ToString());
+WHERE  1=1   {4}
+", where.ToString(), wheremanager.ToString(), whereteacher.ToString(), whereassist.ToString(), where2.ToString());
             return builder.ToString();
         }
 

Edu.WebApi/Controllers/User/UserController.cs

@@ -628,9 +628,10 @@ namespace Edu.WebApi.Controllers.User
             query.Group_Id = base.UserInfo.Group_Id;
             var list = employeeModule.GetEmployeePageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             pageModel.Count = rowsCount;
-            pageModel.PageData = list.Select(qitem => new
+            pageModel.PageData = list.Select((qitem, i) => new
             {
-                qitem.Id,
+                Id = i + 1,
+                // qitem.Id,
                 qitem.UserIcon,
                 qitem.EmployeeName,
                 qitem.SchoolName,