From db1714c401a05b8fd5886804115ff1ddbfb095dd Mon Sep 17 00:00:00 2001
From: Sander Schepers <sander.schepers@aareon.nl>
Date: Fri, 7 Feb 2025 11:14:19 +0000
Subject: [PATCH] FMHN#84596 Heractiveren ongeacht operator (ook handmatige
 imports)

svn path=/Customer/trunk/; revision=67905
---
 FMHN/fmhn.sql | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/FMHN/fmhn.sql b/FMHN/fmhn.sql
index 9ec78bbe8..1348fd688 100644
--- a/FMHN/fmhn.sql
+++ b/FMHN/fmhn.sql
@@ -4902,6 +4902,24 @@ BEGIN
                   FROM prs_perslid p, prs_v_afdeling b
                  WHERE     b.prs_afdeling_key = p.prs_afdeling_key
                        AND p.prs_perslid_key = v_perslid_key;
+                       
+                    -- FMHN#84596: Heractiveren account (ongeacht operator)
+                    v_errormsg := 'Fout heractiveren persoon';
+
+                    UPDATE prs_perslid
+                       SET prs_perslid_inactief = NULL
+                     WHERE     prs_perslid_key = v_perslid_key
+                           AND (   TRUNC (rc.einddat) > TRUNC (SYSDATE)
+                                OR rc.einddat = NULL)
+                           AND NOT EXISTS
+                                   (SELECT 1
+                                      FROM prs_kenmerklink kl
+                                     WHERE     kl.prs_kenmerk_key = 1100 -- Handmatige inactiefdatum
+                                           AND kl.PRS_LINK_KEY =
+                                               v_perslid_key
+                                           AND kl.prs_kenmerklink_verwijder
+                                                   IS NULL);
+
             ELSE
                 v_afdeling_key_old := TO_NUMBER (NULL);     -- Don't care!
                 v_bedrijf_key_old := TO_NUMBER (NULL);      -- Don't care!
@@ -5007,22 +5025,7 @@ BEGIN
                       prs_perslid_mobiel = DECODE (rc.mob, '[wis]', NULL, COALESCE (rc.mob, prs_perslid_mobiel)),
                       prs_perslid_email = COALESCE (rc.email, prs_perslid_email),
                       prs_perslid_externsyncdate = SYSDATE
-                WHERE prs_perslid_key = v_perslid_key;
-
-                v_errormsg := 'Fout heractiveren persoon';
-                UPDATE prs_perslid
-                   SET prs_perslid_inactief = NULL
-                 WHERE     prs_perslid_key = v_perslid_key
-                       AND (   TRUNC (rc.einddat) > TRUNC (SYSDATE)
-                            OR rc.einddat = NULL)
-                       AND NOT EXISTS
-                               (SELECT 1
-                                  FROM prs_kenmerklink kl
-                                 WHERE     kl.prs_kenmerk_key = 1100 -- Handmatige inactiefdatum
-                                       AND kl.PRS_LINK_KEY =
-                                           v_perslid_key
-                                       AND kl.prs_kenmerklink_verwijder
-                                               IS NULL);                
+                WHERE prs_perslid_key = v_perslid_key;            
 
                -- Alleen bij nieuwe persoon of ook bij bestaande persoon?
                v_errormsg := 'Fout bijwerken mincode';