From 69ad910a1a4f71a4f9e937ae7baade103bf8dfd9 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sat, 25 May 2024 19:57:29 +0800
Subject: [PATCH] update

---
 .../works/bgsp/OaApproveController.php           | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/adminapi/controller/works/bgsp/OaApproveController.php b/app/adminapi/controller/works/bgsp/OaApproveController.php
index 2c2ef14d6..b053565f0 100644
--- a/app/adminapi/controller/works/bgsp/OaApproveController.php
+++ b/app/adminapi/controller/works/bgsp/OaApproveController.php
@@ -488,7 +488,7 @@
 				->where($map)
 				->order('f.id desc')
 				->group('f.id')
-				->page($page_no, $page_size)
+				->page($page_no, $page_size)->select()
 				->each(function($item){
 					$item['create_time'] = date('Y-m-d H:i', $item['create_time']);
 					$item['check_user'] = '-';
@@ -497,7 +497,7 @@
 						$item['check_user'] = implode(',',$check_user);
 					}
 					return $item;
-				});
+				})->toArray();
 			$count = Db::name('oa_approve')->where($map)->count();
 			return $this->success('成功', compact('count', 'list', 'page_no', 'page_size'));
 		}
@@ -526,7 +526,7 @@
 					->whereOr([$map1,$map2])
 					->order('f.id desc')
 					->group('f.id')
-					->page($page_no, $page_size)
+					->page($page_no, $page_size)->select()
 					->each(function($item){
 						$item['create_time'] = date('Y-m-d H:i', $item['create_time']);
 						$item['check_user'] = '-';
@@ -535,7 +535,7 @@
 							$item['check_user'] = implode(',',$check_user);
 						}
 						return $item;
-					});
+					})->toArray();
 				$count = Db::name('oa_approve')->whereOr([$map1,$map2])->count();
 			}
 			
@@ -549,7 +549,7 @@
 					->where($map1)
 					->order('f.id desc')
 					->group('f.id')
-					->page($page_no, $page_size)
+					->page($page_no, $page_size)->select()
 					->each(function($item){
 						$item['create_time'] = date('Y-m-d H:i', $item['create_time']);
 						$item['check_user'] = '-';
@@ -558,7 +558,7 @@
 							$item['check_user'] = implode(',',$check_user);
 						}
 						return $item;
-					});
+					})->toArray();
 				$count = Db::name('oa_approve')->where($map1)->count();
 			}
 			if($status == 2){
@@ -571,7 +571,7 @@
 					->where($map2)
 					->order('f.id desc')
 					->group('f.id')
-					->page($page_no, $page_size)
+					->page($page_no, $page_size)->select()
 					->each(function($item, $key){
 						$item['create_time'] = date('Y-m-d H:i', $item['create_time']);
 						$item['check_user'] = '-';
@@ -580,7 +580,7 @@
 							$item['check_user'] = implode(',',$check_user);
 						}
 						return $item;
-					});
+					})->toArray();
 				$count = Db::name('oa_approve')->where($map2)->count();
 			}
 			return $this->success('成功', compact('count', 'list', 'page_no', 'page_size'));