|
@@ -50,7 +50,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
// Where pm_ws.IsDel = 0 And pm_ws.YearMonth = '{0}'", yearMonth);
|
|
// Where pm_ws.IsDel = 0 And pm_ws.YearMonth = '{0}'", yearMonth);
|
|
|
|
|
|
//公司部门
|
|
//公司部门
|
|
- string sql = string.Format(@"Select row_number() over(order by pm_ws.Id) as Row_Number,
|
|
|
|
|
|
+ string sql = string.Format(@"Select row_number() over(order by pm_ws.UserId) as Row_Number,
|
|
sc.Id as CompanyId,sc.CompanyName,sd.Id as DepId,sd.DepName,
|
|
sc.Id as CompanyId,sc.CompanyName,sd.Id as DepId,sd.DepName,
|
|
sys_u1.CnName Name,sys_u2.CnName LastUpdateUserName,pm_ws.*
|
|
sys_u1.CnName Name,sys_u2.CnName LastUpdateUserName,pm_ws.*
|
|
From Pm_WageSheet pm_ws
|
|
From Pm_WageSheet pm_ws
|