diff --git a/HRM.DA/DA/SearchReport/SearchEmployeeDA.cs b/HRM.DA/DA/SearchReport/SearchEmployeeDA.cs index 5efb28a..1708f0f 100644 --- a/HRM.DA/DA/SearchReport/SearchEmployeeDA.cs +++ b/HRM.DA/DA/SearchReport/SearchEmployeeDA.cs @@ -54,85 +54,73 @@ ON "; + // Restricts #tmpEmpSrc to the user's data permissions. + // Each configured permission type (1=Category, 2=Grade, 3=Department, 4=Location) is a filter; + // when several types are configured an employee must satisfy all of them (same rule as before). + // Department and Location permissions include all child nodes. + // Parameters: %n = UserID, %n = PayrollTypeID. public const string fnddataPermissionSQL = @" -IF EXISTS -( - SELECT* - FROM DataPermission - WHERE userid = %n and PayrollTypeID = %n and PermissionType=1 -) - BEGIN - delete from #tmpEmpSrc where categoryid not in ( select referenceid from DataPermission where UserID =%n and PayrollTypeID =%n and PermissionType=1); -END; -IF EXISTS -( - SELECT* - FROM DataPermission - WHERE userid = %n and PayrollTypeID = %n and PermissionType=2 -) - BEGIN - delete from #tmpEmpSrc where GRADEID not in ( select referenceid from DataPermission where UserID =%n and PayrollTypeID =%n and PermissionType=2); +DECLARE @dpUserID INT = %n, @dpPayrollTypeID INT = %n; + +IF OBJECT_ID('tempdb..#dpPerm') IS NOT NULL DROP TABLE #dpPerm; +IF OBJECT_ID('tempdb..#dpDept') IS NOT NULL DROP TABLE #dpDept; +IF OBJECT_ID('tempdb..#dpLoc') IS NOT NULL DROP TABLE #dpLoc; + +-- Read DataPermission once instead of once per type +SELECT DISTINCT PermissionType, ReferenceID +INTO #dpPerm +FROM DataPermission +WHERE UserID = @dpUserID + AND PayrollTypeID = @dpPayrollTypeID + AND ReferenceID IS NOT NULL + AND ISNULL(PermissionStatus, 0) <> 3; -- 3 = Removed + +-- Category (1) +IF EXISTS (SELECT 1 FROM #dpPerm WHERE PermissionType = 1) + DELETE FROM #tmpEmpSrc + WHERE NOT EXISTS (SELECT 1 FROM #dpPerm p WHERE p.PermissionType = 1 AND p.ReferenceID = #tmpEmpSrc.CategoryID); + +-- Grade (2) +IF EXISTS (SELECT 1 FROM #dpPerm WHERE PermissionType = 2) + DELETE FROM #tmpEmpSrc + WHERE NOT EXISTS (SELECT 1 FROM #dpPerm p WHERE p.PermissionType = 2 AND p.ReferenceID = #tmpEmpSrc.GradeID); + +-- Department (3): permitted departments plus all descendants +IF EXISTS (SELECT 1 FROM #dpPerm WHERE PermissionType = 3) +BEGIN + ;WITH cteDept (DepartmentID) AS + ( + SELECT ReferenceID FROM #dpPerm WHERE PermissionType = 3 + UNION ALL + SELECT d.DEPARTMENTID FROM DEPARTMENT d INNER JOIN cteDept c ON d.PARENTID = c.DepartmentID + ) + SELECT DISTINCT DepartmentID INTO #dpDept FROM cteDept; + + DELETE FROM #tmpEmpSrc + WHERE NOT EXISTS (SELECT 1 FROM #dpDept x WHERE x.DepartmentID = #tmpEmpSrc.DepartmentID); + + DROP TABLE #dpDept; END; -IF EXISTS -( - SELECT* - FROM DataPermission - WHERE userid = %n and PayrollTypeID = %n and PermissionType=3 -) - BEGIN - IF OBJECT_ID('tempdb..#TEMPDOC') IS NOT NULL DROP TABLE #TEMPDOC - ;WITH - cteReports(departmentid) +-- Location (4): permitted locations plus all descendants +IF EXISTS (SELECT 1 FROM #dpPerm WHERE PermissionType = 4) +BEGIN + ;WITH cteLoc (LocationID) AS + ( + SELECT ReferenceID FROM #dpPerm WHERE PermissionType = 4 + UNION ALL + SELECT l.LOCATIONID FROM LOCATION l INNER JOIN cteLoc c ON l.PARENTID = c.LocationID + ) + SELECT DISTINCT LocationID INTO #dpLoc FROM cteLoc; - AS - ( - SELECT departmentid FROM DEPARTMENT + DELETE FROM #tmpEmpSrc + WHERE NOT EXISTS (SELECT 1 FROM #dpLoc x WHERE x.LocationID = #tmpEmpSrc.LocationID); - WHERE DEPARTMENTID in (select referenceid from DataPermission where UserID = %n and PayrollTypeID = %n and PermissionType = 3) - - UNION ALL - - SELECT e.departmentid FROM DEPARTMENT e - INNER JOIN cteReports r ON e.PARENTID = r.departmentid - ) SELECT* INTO #TEMPDOC FROM cteReports - - - delete from #tmpEmpSrc where Departmentid NOT in (SELECT * FROM #TEMPDOC); + DROP TABLE #dpLoc; END; - -IF EXISTS -( - SELECT* - FROM DataPermission - WHERE userid = %n and PayrollTypeID = %n and PermissionType=4 -) - BEGIN - - IF OBJECT_ID('tempdb..#tmpLOC') IS NOT NULL - DROP TABLE #tmpLOC - - -- delete from #tmpEmpSrc where locationid NOT in ( - ; WITH - cteReports(locationid) - - AS - ( - SELECT locationid FROM location - - WHERE LOCATIONid in (select referenceid from DataPermission where UserID = %n and PayrollTypeID = %n and PermissionType = 4) - - UNION ALL - - SELECT e.locationid FROM location e - INNER JOIN cteReports r ON e.PARENTID = r.locationid - ) SELECT* INTO #tmpLOC FROM cteReports - - - delete from #tmpEmpSrc where locationid NOT in ( SELECT *FROM #tmpLOC); - DROP TABLE #tmpLOC; -END;"; +DROP TABLE #dpPerm; +"; public const string fnddropTempSQL = @" @@ -161,11 +149,8 @@ END;"; } internal static IDataReader Search(TransactionContext tc, string sql, int userid, int payrolltypeid) { - string qry = SQLParser.MakeSQL(SearchEmployeeDA.fndSQL + SearchEmployeeDA.fnddataPermissionSQL + SearchEmployeeDA.fnddropTempSQL, sql, - userid, payrolltypeid,userid, payrolltypeid, userid, payrolltypeid, userid, payrolltypeid, - userid, payrolltypeid, userid, payrolltypeid, userid, payrolltypeid, userid, payrolltypeid); - //return tc.ExecuteReader(@"%q" + - // "", sql, userid, payrolltypeid, userid, payrolltypeid, userid, payrolltypeid, userid, payrolltypeid, userid, payrolltypeid); + string qry = SQLParser.MakeSQL(SearchEmployeeDA.fndSQL + SearchEmployeeDA.fnddataPermissionSQL + SearchEmployeeDA.fnddropTempSQL, + sql, userid, payrolltypeid); return tc.ExecuteReader(qry); } diff --git a/HRM.UI/ClientApp/src/app/authentication/data-permssion/data-permssion.component.html b/HRM.UI/ClientApp/src/app/authentication/data-permssion/data-permssion.component.html index 83af8ae..339bf16 100644 --- a/HRM.UI/ClientApp/src/app/authentication/data-permssion/data-permssion.component.html +++ b/HRM.UI/ClientApp/src/app/authentication/data-permssion/data-permssion.component.html @@ -25,7 +25,9 @@