php代码提交

Server/application/cunkebao/controller/WorkbenchController.php

@@ -1884,6 +1884,7 @@ class WorkbenchController extends Controller
         $limit = $this->request->param('limit', 10);
         $keyword = $this->request->param('keyword', '');
         $workbenchId = $this->request->param('workbenchId', '');
+        $isRecycle = $this->request->param('isRecycle', '');
         if (empty($workbenchId)) {
             return json(['code' => 400, 'msg' => '参数错误']);
         }
@@ -1897,7 +1898,7 @@ class WorkbenchController extends Controller
             ->join(['s2_wechat_friend' => 'wf'], 'wtc.wechatFriendId = wf.id')
             ->join('users u', 'wtc.wechatAccountId = u.s2_accountId', 'left')
             ->field([
-                'wtc.id', 'wtc.isRecycle', 'wtc.isRecycle', 'wtc.createTime',
+                'wtc.id', 'wtc.isRecycle', 'wtc.isRecycle', 'wtc.createTime','wtc.recycleTime',
                 'wf.wechatId', 'wf.alias', 'wf.nickname', 'wf.avatar', 'wf.gender', 'wf.phone',
                 'u.account', 'u.username'
             ])
@@ -1908,11 +1909,18 @@ class WorkbenchController extends Controller
             $query->where('wf.wechatId|wf.alias|wf.nickname|wf.phone|u.account|u.username', 'like', '%' . $keyword . '%');
         }
 
+        if ($isRecycle != '' || $isRecycle != null) {
+            $query->where('isRecycle',$isRecycle);
+        }
+
+
+
         $total = $query->count();
         $list = $query->page($page, $limit)->select();
 
         foreach ($list as &$item) {
             $item['createTime'] = date('Y-m-d H:i:s', $item['createTime']);
+            $item['recycleTime'] = date('Y-m-d H:i:s', $item['recycleTime']);
         }
         unset($item);