提交

application/approve/controller/ApproveInfo.php

@@ -132,7 +132,6 @@ class ApproveInfo extends Controller
             $this->title = $this->get_module_list[$data['module']] . '详情';
             $this->get_type_list = CommonService::get_type_list($data['module']);
         }
-//        p($data->toArray());
         return $this->fetch('form', ['vo' => $data]);
     }
 

application/approve/controller/ApproveInfoLog.php

@@ -86,16 +86,15 @@ class ApproveInfoLog extends Controller
         $data = model::find(input('id') ?:0);
         if($data){
             $data = $data->toArray();
-            $data['before_text']['module_info']['document_text'] = isset($data['before_text']['module_info']['document']) ? explode(',', $data['before_text']['module_info']['document']) : [];
-            $data['before_text']['module_info']['images_text'] = isset($data['before_text']['module_info']['images']) ? explode(',', $data['before_text']['module_info']['images']) : [];
-            $data['after_text']['module_info']['document_text'] = isset($data['after_text']['module_info']['images']) ? explode(',', $data['after_text']['module_info']['document']) : [];
-            $data['after_text']['module_info']['images_text'] = isset($data['after_text']['module_info']['images']) ? explode(',', $data['after_text']['module_info']['images']) : [];
+            $data['before_text']['module_info']['document_text'] = isset($data['before_text']['module_info']['document']) ? array_filter(explode(',', $data['before_text']['module_info']['document'])) : [];
+            $data['before_text']['module_info']['images_text'] = isset($data['before_text']['module_info']['images']) ? array_filter(explode(',', $data['before_text']['module_info']['images'])) : [];
+            $data['after_text']['module_info']['document_text'] = isset($data['after_text']['module_info']['document']) ? array_filter(explode(',', $data['after_text']['module_info']['document'])) : [];
+            $data['after_text']['module_info']['images_text'] = isset($data['after_text']['module_info']['images']) ? array_filter(explode(',', $data['after_text']['module_info']['images'])) : [];
 
             $this->title = '审批人修改记录详情-'.$this->get_module_list[$data['module']];
             $this->get_type_list = CommonService::get_type_list($data['module']);
+            p($data);exit;
         }
-//        p($data);exit;
-
         return $this->fetch('form', ['vo' => $data['before_text'],'vo2'=>$data['after_text']]);
     }
 

application/common/model/ApproveApply.php

@@ -22,13 +22,13 @@ class ApproveApply extends Model
     public function getDocumentTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['document']) ? $data['document'] : '');
-        return $value ? explode(',', $value) : [];
+        return $value ? array_filter(explode(',', $value)) : [];
     }
 
     public function getImagesTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['images']) ? $data['images'] : '');
-        return $value ? explode(',', $value) : [];
+        return $value ? array_filter(explode(',', $value)) : [];
     }
 
 }

application/common/model/ApproveCar.php

@@ -22,13 +22,13 @@ class ApproveCar extends Model
     public function getDocumentTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['document']) ? $data['document'] : '');
-        return $value ? explode(',', $value) : [];
+        return $value ? array_filter(explode(',', $value)) : [];
     }
 
     public function getImagesTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['images']) ? $data['images'] : '');
-        return $value ? explode(',', $value) : [];
+        return $value ? array_filter(explode(',', $value)) : [];
     }
 
 }

application/common/model/ApproveContract.php

@@ -21,7 +21,7 @@ class ApproveContract extends Model
     public function getDocumentTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['document']) ? $data['document'] : '');
-        return $value ? explode(',', $value) : [];
+        return $value ? array_filter(explode(',', $value)) : [];
     }
 
 }

application/common/model/ApproveEvection.php

@@ -22,13 +22,13 @@ class ApproveEvection extends Model
     public function getDocumentTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['document']) ? $data['document'] : '');
-        return $value ? explode(',', $value) : [];
+        return $value ? array_filter(explode(',', $value)) : [];
     }
 
     public function getImagesTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['images']) ? $data['images'] : '');
-        return $value ? explode(',', $value) : [];
+        return $value ? array_filter(explode(',', $value)) : [];
     }
 
 }

application/common/model/ApproveFile.php

@@ -21,7 +21,7 @@ class ApproveFile extends Model
     public function getDocumentTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['document']) ? $data['document'] : '');
-        return $value ? explode(',', $value) : [];
+        return $value ? array_filter(explode(',', $value)) : [];
     }
 
 }

application/common/model/ApproveLeave.php

@@ -22,13 +22,13 @@ class ApproveLeave extends Model
     public function getDocumentTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['document']) ? $data['document'] : '');
-        return $value ? explode(',', $value) : [];
+        return $value ? array_filter(explode(',', $value)) : [];
     }
 
     public function getImagesTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['images']) ? $data['images'] : '');
-        return $value ? explode(',', $value) : [];
+        return $value ? array_filter(explode(',', $value)) : [];
     }
 
 }

application/common/model/ApproveMaintain.php

@@ -20,13 +20,13 @@ class ApproveMaintain extends Model
     public function getImagesTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['images']) ? $data['images'] : '');
-        return $value ? explode(',', $value) : [];
+        return $value ? array_filter(explode(',', $value)) : [];
     }
 
     public function getFeedbackImagesTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['feedback_images']) ? $data['feedback_images'] : '');
-        return $value ? explode(',', $value) : [];
+        return $value ? array_filter(explode(',', $value)) : [];
     }
 
 }

application/common/model/ApproveOffer.php

@@ -21,7 +21,7 @@ class ApproveOffer extends Model
     public function getDocumentTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['document']) ? $data['document'] : '');
-        return $value ? explode(',', $value) : [];
+        return $value ? array_filter(explode(',', $value)) : [];
     }
 
 }

application/common/model/ApproveSchool.php

@@ -21,7 +21,7 @@ class ApproveSchool extends Model
     public function getDocumentTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['document']) ? $data['document'] : '');
-        return $value ? explode(',', $value) : [];
+        return $value ? array_filter(explode(',', $value)) : [];
     }
 
 }

application/common/model/ApproveStock.php

@@ -22,13 +22,13 @@ class ApproveStock extends Model
     public function getDocumentTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['document']) ? $data['document'] : '');
-        return $value ? explode(',', $value) : [];
+        return $value ? array_filter(explode(',', $value)) : [];
     }
 
     public function getImagesTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['images']) ? $data['images'] : '');
-        return $value ? explode(',', $value) : [];
+        return $value ? array_filter(explode(',', $value)) : [];
     }
 
 }

application/common/model/ApproveUse.php

@@ -21,7 +21,7 @@ class ApproveUse extends Model
     public function getDocumentTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['document']) ? $data['document'] : '');
-        return $value ? explode(',', $value) : [];
+        return $value ? array_filter(explode(',', $value)) : [];
     }
 
 }