MC-30109: Deleting an empty user model caused deleting admin role

Author: zakdma

app/code/Magento/User/Model/ResourceModel/User.php

@@ -258,17 +258,17 @@ public function delete(\Magento\Framework\Model\AbstractModel $user)
 
         $uid = $user->getId();
         $connection->beginTransaction();
-        try {
-            if ($uid) {
+        if ($uid) {
+            try {
                 $connection->delete($this->getMainTable(), ['user_id = ?' => $uid]);
                 $connection->delete(
                     $this->getTable('authorization_role'),
                     ['user_id = ?' => $uid, 'user_type = ?' => UserContextInterface::USER_TYPE_ADMIN]
                 );
+            } catch (\Magento\Framework\Exception\LocalizedException $e) {
+                $connection->rollBack();
+                return false;
             }
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $connection->rollBack();
-            return false;
         }
         $connection->commit();
         $this->_afterDelete($user);