From 4e2d3b772f6a161c5f98aee92c8b49af461ab72a Mon Sep 17 00:00:00 2001
From: benny <benny@roojs.com>
Date: Thu, 13 Sep 2018 10:59:32 +0800
Subject: [PATCH] DataObjects/Core_company.php

---
 DataObjects/Core_company.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index 25e37a02..8f519ae9 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -260,15 +260,12 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     function beforeUpdate($old, $q,$roo)
     {
          
-        if(!empty($q['_flag_delete'])){
-            if($q['_flag_delete'] * 1 == 1){
-                
-                $this->deleted_dt = $this->sqlValue("NOW()");
-                $this->deleted_by = $roo->getAuthUser()->id;
-            } 
+        if(!empty($q['_flag_delete']) && $q['_flag_delete'] * 1 == 1){
+            $this->deleted_dt = $this->sqlValue("NOW()");
+            $this->deleted_by = $roo->getAuthUser()->id;
         }
         
-        if(!empty($q['_flag_undelete'])){
+        if(!empty($q['_flag_undelete']) && $q['_flag_delete'] * 1 == 1){
             $this->deleted_dt = "";
             $this->deleted_by = 0;
         }
-- 
2.39.2