提交

app/common/controller/Pub.php

@@ -356,7 +356,7 @@ class Pub
         Cache::set($account,$code,300);
         Cache::set($account.'_time',$code,60);
         if($acType==2){
-            $conf=Config::where(['field'=>'smtp'])->value('val');
+            $conf=Config::getFieldValue('smtp');
             $conf['temp']='code';
             $mail=new \mail\Mail($conf);
             $mail->sendEmail([$account],$text,$code);

app/enterprise/controller/Im.php

@@ -266,7 +266,7 @@ class Im extends BaseController
     // 获取联系人列表
     public function getContacts()
     {
-        $data = User::getUserList([['status', '=', 1], ['user_id', '<>', $this->userInfo['user_id']]], $this->userInfo['user_id'] , '', $this->userInfo['role']);
+        $data = User::getUserList($this->userInfo, [['status', '=', 1], ['user_id', '<>', $this->userInfo['user_id']]], $this->userInfo['user_id'] , '', $this->userInfo['role']);
         $count=Friend::where(['status'=>2,'friend_user_id'=>$this->uid])->count();
         $time=Friend::where(['friend_user_id'=>$this->uid,'is_invite'=>1])->order('create_time desc')->value('create_time');
         return success('', $data,$count,$time*1000);

app/enterprise/model/User.php

@@ -116,7 +116,7 @@ class User extends BaseModel
    }
 
    //查询用户列表
-   public static function getUserList($map, $user_id, $field = "", $role = 0)
+   public static function getUserList($userInfo, $map, $user_id, $field = "", $role = 0)
    {
       if (!$field) {
          $field = self::$defaultField;
@@ -134,16 +134,16 @@ class User extends BaseModel
       }else{
          $userList = [];
          // 将专属客服设置为好友
-         $csUid=request()->userInfo['cs_uid'] ?? 0;
+         $csUid=$userInfo['cs_uid'] ?? 0;
          if($csUid){
             $userList[]=$csUid;
          }
          // 如果是管理员，就查询整个部门的客服好友
-         if (request()->userInfo['role'] > 0) {
+         if ($userInfo['role'] > 0) {
              $friendList = Friend::getFriend(['create_user' => $user_id,'status'=>1]);//管理员自己的好友
              $userList = array_merge($userList, array_keys($friendList));
              
-             $admin_id = request()->userInfo['uid'];
+             $admin_id = $userInfo['uid'];
              $department_cs_uids = Department::getDepartmentCsUids($admin_id);//整个部门的用户
              $department_cs_uids[] = $user_id;
              $cus=self::whereIn('cs_uid',$department_cs_uids)->column('user_id');