Explorar el Código

修复工点管理接口报错的情况

ChenWuJie hace 4 años
padre
commit
ec2fee23b7
Se han modificado 1 ficheros con 11 adiciones y 3 borrados
  1. 11 3
      app/Models/BaseModel.php

+ 11 - 3
app/Models/BaseModel.php

xqd
@@ -91,9 +91,17 @@ class BaseModel extends Model
     public function getNameOrLabel($column, $type = 'name')
     {
         $option = Option::get($this->getTable(), $column, $this[$column], null);
-        if(!$option) return '';
-        if($type == 'name') return $option->name;
-        else return '<div class="layui-badge layui-bg-' . $option->label_type . '">' . $option->name . '</div>';
+        if(!$option)
+        {
+            return '';
+        }
+        if($type == 'name')
+        {
+            return '<div class="layui-badge">' . $option->name . '</div>';
+        } else
+        {
+            return '<div class="layui-badge layui-bg-' . $option->label_type . '">' . $option->name . '</div>';
+        }
     }
 
     public function transMoney($money) {