cqpCow 2 лет назад
Родитель
Сommit
015926553b
1 измененных файлов с 5 добавлено и 2 удалено
  1. 5 2
      app/Service/EmployeeService.php

+ 5 - 2
app/Service/EmployeeService.php

@@ -520,9 +520,12 @@ class EmployeeService extends Service
         if($this->isEmpty($data,'account')) return [false,'账号不能为空!'];
         if($this->isEmpty($data,'password')) return [false,'密码不存在!'];
 
+        $account = $data['account'];
         $res = Employee::where('del_time',0)
-            ->where('account', $data['account'])
-            ->Orwhere('emp_name', $data['account'])
+            ->where(function ($query)use($account) {
+                $query->where('account', $account)
+                    ->orWhere('emp_name', $account);
+            })
             ->get()->toArray();
 
         if(empty($res)) return [false,'账号不存在或已被删除!'];