From 157933565a5af94d2b2caf4b99d97632a6f6b05b Mon Sep 17 00:00:00 2001
From: Robin Stoker <robin.stoker@aareon.nl>
Date: Thu, 16 Dec 2021 14:57:35 +0000
Subject: [PATCH] APGR#69547 -- Aanpassingen in AD import.

svn path=/Customer/trunk/; revision=54194
---
 APGR/apgr.sql | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/APGR/apgr.sql b/APGR/apgr.sql
index efb899400..b2f588918 100644
--- a/APGR/apgr.sql
+++ b/APGR/apgr.sql
@@ -140,15 +140,17 @@ CREATE OR REPLACE PROCEDURE apgr_update_prs (
   -- Alle personen verwijderen die niet meer in import bestand voorkomen.
   CURSOR c_del
   IS
-      SELECT p.prs_perslid_key, p.prs_perslid_oslogin, pf.prs_perslid_naam_full
-        FROM fac_imp_perslid i, prs_perslid p, prs_v_perslid_fullnames_all pf
-       WHERE UPPER (p.prs_perslid_oslogin) = UPPER (i.prs_perslid_oslogin(+))
-         AND pf.prs_perslid_key = p.prs_perslid_key
-         AND p.prs_perslid_oslogin IS NOT NULL
-         AND i.prs_perslid_oslogin IS NULL
-         AND p.prs_perslid_verwijder IS NULL
-         AND substr(p.prs_perslid_oslogin, 1, 1) != '_'
-    ORDER BY 2;
+        SELECT p.prs_perslid_key
+            FROM prs_v_aanwezigperslid p
+           WHERE     (   p.prs_perslid_oslogin IS NULL
+                      OR p.prs_perslid_oslogin NOT LIKE '\_%' ESCAPE '\') -- ' tbv. opmaak
+                 AND p.prs_perslid_oslogin2 IS NULL
+                 AND NOT EXISTS
+                         (SELECT 1
+                            FROM fac_imp_perslid i
+                           WHERE UPPER (i.prs_perslid_oslogin) =
+                                 UPPER (p.prs_perslid_oslogin))
+        ORDER BY 1;
 
   v_count           NUMBER;