脱敏方法兼容

app/Admin/Controllers/PatientController.php

@@ -26,12 +26,12 @@ protected function grid()
             $grid->column('id')->sortable();
             $grid->column('id')->sortable();
             $grid->column('name');
             $grid->column('name');
             $grid->column('id_card')->display(function ($content) {
             $grid->column('id_card')->display(function ($content) {
-                return data_masking($content ?? '', 'idcard');
+                return data_masking($content, 'idcard');
             });
             });
             $grid->column('gender', '性别')->using(PatientModel::SEX_MAP);
             $grid->column('gender', '性别')->using(PatientModel::SEX_MAP);
             $grid->column('age', '年龄');
             $grid->column('age', '年龄');
             $grid->column('mobile')->display(function ($content) {
             $grid->column('mobile')->display(function ($content) {
-                return data_masking($content ?? '', 'mobile');
+                return data_masking($content, 'mobile');
             });
             });
             $grid->column('is_default')->using(PatientModel::IS_DEFAULT_MAP)->dot(PatientModel::IS_DEFAULT_MAP_COLOR);
             $grid->column('is_default')->using(PatientModel::IS_DEFAULT_MAP)->dot(PatientModel::IS_DEFAULT_MAP_COLOR);
             $grid->column('user.id', '关联用户');
             $grid->column('user.id', '关联用户');

app/helpers.php

@@ -94,13 +94,13 @@ function getSexByIdCard($idCard)
     /**
     /**
      * 数据脱敏.
      * 数据脱敏.
      *
      *
-     * @param  string  $strType  脱敏类型，姓名、生日、手机号……
+     * @param  string|null  $strType  脱敏类型，姓名、生日、手机号……
      * @param  string  $str  被脱敏文本
      * @param  string  $str  被脱敏文本
      * @return string 脱敏后文本
      * @return string 脱敏后文本
      */
      */
-    function data_masking(string $str, string $strType)
+    function data_masking($str, string $strType)
     {
     {
-        if (! isset($str) || (! trim($str) && trim($str) == '')) {
+        if (is_null($str) || $str === '' || trim($str) === '') {
             return $str;
             return $str;
         }
         }
         switch ($strType) {
         switch ($strType) {