From 65d6f2d81a8d980dd4710c17b084f91493d04dd3 Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Mon, 20 Jun 2022 11:22:37 +0800
Subject: [PATCH] owners_620_2

---
 admin/controllers/receiver/Owners.php                   | 8 ++++++--
 common/models/receiver/Receiver_owners_oplogs_model.php | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/admin/controllers/receiver/Owners.php b/admin/controllers/receiver/Owners.php
index a1e01096..eb29287f 100644
--- a/admin/controllers/receiver/Owners.php
+++ b/admin/controllers/receiver/Owners.php
@@ -149,7 +149,11 @@ class Owners extends HD_Controller
         $info['c_time'] = date('Y-m-d H:i:s', $row['c_time']);
         $info['tag'] = $this->get_tag($row['id']);
         //操作日志
-        $rows_log = $this->mdOwnersOplogs->select(array('own_id' => $id), 'id desc', 0, 0);
+        $rows_log = $this->mdOwnersOplogs->select(['own_id' => $id], 'id desc', 0, 0);
+        if($this->input->get('dev')){
+            print_r($rows_log);
+            echo '-----';
+        }
         $logs = [];
         if ($rows_log) {
             foreach ($rows_log as $key => $value) {
@@ -176,7 +180,7 @@ class Owners extends HD_Controller
                     'imgs' => $imgs,
                     'rec_url' => $rec_url,
                     'rec_text' => $rec_text,
-                    'type_name' => $this->mdOwnersOplogs->typeAry()[$value['type']],
+                    'type_name' => $this->mdOwnersOplogs->typeAry($value['type']),
                     'c_time' => date('Y-m-d H:i', $value['c_time'])
                 );
             }
diff --git a/common/models/receiver/Receiver_owners_oplogs_model.php b/common/models/receiver/Receiver_owners_oplogs_model.php
index 2dbf5981..f7530dd0 100644
--- a/common/models/receiver/Receiver_owners_oplogs_model.php
+++ b/common/models/receiver/Receiver_owners_oplogs_model.php
@@ -23,14 +23,14 @@ class Receiver_owners_oplogs_model extends HD_Model
      * @param int $id
      * @return array|mixed
      */
-    public function typeAry($id = 0)
+    public function typeAry($id = '')
     {
         $arr = [0 => '小记', 1 => '发短信', 2 => '拨打号码', 3 => '系统'];
-        if ($id) {
+        if (strlen($id)) {
             return $arr[$id];
         } else {
             return $arr;
         }
     }
 
-}
+}
\ No newline at end of file