修复账户表学校读取

Property.Mobule.User/AccountModule.cs

@@ -53,6 +53,16 @@ namespace Property.Module.UserModule
             return accountRepository.GetAccountListExtRepository(query);
         }
 
+        /// <summary>
+        /// 获取账号列表扩展列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<Employee_ViewModel> GetEmployeeListExtModule(Employee_ViewModel query)
+        {
+            return accountRepository.GetEmployeeListRepository(query);
+        }
+
         /// <summary>
         /// 获取学员账号信息
         /// </summary>

Property.Modele.FixedAssets/SuppliesModule.cs

@@ -1187,7 +1187,6 @@ namespace Property.Module.FixedAssets
                     model.Remark = demodel.Remark;
                     model.UpdateBy = demodel.UpdateBy;
                     model.UpdateDate = demodel.UpdateDate;
-                    model.StockOutState = StockOutStatusEnum.StockOut;
                     bool flag = supplies_StockOutRepository.Update(model, trans);
                     if (flag)
                     {

Property.Repository/User/RB_AccountRepository.cs

@@ -135,15 +135,21 @@ SELECT A.*,IFNULL(G.GroupName,'') AS GroupName,IFNULL(s.SName,'') AS SchoolName,
        ,IFNULL(d.DeptName,'') AS DeptName,IFNULL(p.PostName,'') AS PostName
 FROM 
 (
-		SELECT A.*,IFNULL(B.MName,'') AS AccountName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id
+		SELECT A.Id,A.Account,A.`Password`, 1 as AccountType
+               ,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay,A.DirectSupervisor
+               ,B.School_Id,IFNULL(B.MName,'') AS AccountName,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 AccountName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id
+		SELECT A.Id,A.Account,A.`Password`, 1 as AccountType
+               ,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay,A.DirectSupervisor
+               ,B.School_Id,IFNULL(B.TeacherName,'') AS AccountName,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 AccountName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id
+		SELECT A.Id,A.Account,A.`Password`, 1 as AccountType
+               ,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay,A.DirectSupervisor
+               ,B.School_Id,IFNULL(B.AssistName,'') AS AccountName,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}
  
@@ -202,8 +208,8 @@ WHERE 1=1 {1}
 SELECT A.*,IFNULL(G.GroupName,'') AS GroupName,IFNULL(s.SName,'') AS SchoolName,IFNULL(G.Logo,'') AS GroupLogo
        ,IFNULL(B.StuName,'') AS AccountName
 FROM   rb_account AS A INNER JOIN rb_student AS B ON A.AccountId=B.StuId 
-       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_group AS g ON B.Group_Id=g.GId
+       LEFT JOIN rb_school AS s ON B.School_Id=s.SId
 WHERE 1=1 {0}
 ", where.ToString());
             var list = Get<RB_Account_ViewModel>(builder.ToString()).ToList();
@@ -486,15 +492,21 @@ 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,B.LeaveStatus
+		SELECT A.Id,A.Account,A.`Password`, 1 as AccountType
+               ,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay,A.DirectSupervisor
+               ,b.School_Id,IFNULL(B.MName,'') AS EmployeeName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id,B.LeaveStatus
 		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,B.LeaveStatus
+		SELECT A.Id,A.Account,A.`Password`, 1 as AccountType
+               ,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay,A.DirectSupervisor
+               ,b.School_Id,IFNULL(B.TeacherName,'') AS EmployeeName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id,B.LeaveStatus
 		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,B.LeaveStatus
+		SELECT A.Id,A.Account,A.`Password`, 1 as AccountType
+               ,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay,A.DirectSupervisor
+               ,b.School_Id,IFNULL(B.AssistName,'') AS EmployeeName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id,B.LeaveStatus
 		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