From e46ad67cf413f2687ffe97944d0742554cbe6d7c Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@easycorp.ltd>
Date: Fri, 18 Oct 2024 06:21:01 +0000
Subject: [PATCH]  * [error] fix import case error.

---
 module/caselib/model.php  | 1 +
 module/caselib/tao.php    | 2 ++
 module/transfer/model.php | 1 +
 3 files changed, 4 insertions(+)

diff --git a/module/caselib/model.php b/module/caselib/model.php
index eb6a0da3f8..90fcd7c07a 100644
--- a/module/caselib/model.php
+++ b/module/caselib/model.php
@@ -296,6 +296,7 @@ class caselibModel extends model
         $this->dao->begin();
         foreach($cases as $key => $caseData)
         {
+            $key = (int)$key;
             if(!empty($data->id[$key]) && !$this->post->insert)
             {
                 $this->caselibTao->updateImportedCase($key, $caseData, $data, $forceNotReview);
diff --git a/module/caselib/tao.php b/module/caselib/tao.php
index 4a115cfedd..376ce31dfd 100644
--- a/module/caselib/tao.php
+++ b/module/caselib/tao.php
@@ -18,6 +18,7 @@ class caselibTao extends caselibModel
 
         foreach($data->lib as $key => $lib)
         {
+            $key = (int)$key;
             $caseData = new stdclass();
 
             $caseData->lib          = $lib;
@@ -36,6 +37,7 @@ class caselibTao extends caselibModel
                 foreach($fieldList as $field)
                 {
                     if(empty($field->show)) continue;
+                    if(!isset($data->{$field->field}[$key])) continue;
 
                     $fieldValue = $data->{$field->field}[$key];
                     $caseData->{$field->field} = $fieldValue;
diff --git a/module/transfer/model.php b/module/transfer/model.php
index 65a093d148..df4e49e2fc 100644
--- a/module/transfer/model.php
+++ b/module/transfer/model.php
@@ -885,6 +885,7 @@ class transferModel extends model
             $tmpArray = new stdClass();
             foreach($row as $currentColumn => $cellValue)
             {
+                $cellValue = trim($cellValue);
                 /* 第一行是标题字段。*/
                 /* First row is title field. */
                 if($currentRow == 1)