gx

 <?php
 
+<<<<<<< HEAD
+namespace App\Http\Controllers\Bside;
+=======
 namespace App\Http\Controllers\Aside;
 
 use App\Http\Controllers\Aside\BaseController;
+>>>>>>> 5bb365e2828ceec83c8a52553d6f4c44a1e1785f
 
 class ManagerController extends BaseController
 {

 <?php
 
+<<<<<<< HEAD
+namespace App\Http\Controllers\Bside;
+=======
 namespace App\Http\Controllers\Aside;
+>>>>>>> 5bb365e2828ceec83c8a52553d6f4c44a1e1785f
 
 
 
 use App\Enums\Common\Code;
+<<<<<<< HEAD
+=======
 use App\Http\Controllers\Aside\BaseController;
+>>>>>>> 5bb365e2828ceec83c8a52553d6f4c44a1e1785f
 
 class MenuController extends BaseController
 {
     public function lists(){
         //TODO::搜索参数处理
+<<<<<<< HEAD
+        $userLogic = new UserLogic();
+        $lists = $userLogic->lists($this->map,$this->p,$this->row,$this->order,['id','name','mobile']);
+        if(empty($lists)){
+            $this->response('请求失败',Code::USER_ERROR,[]);
+        }
+        $this->result($lists);
+=======
+>>>>>>> 5bb365e2828ceec83c8a52553d6f4c44a1e1785f
     }
 }

@@ -2,6 +2,11 @@
 
 namespace App\Http\Controllers\Aside;
 
+<<<<<<< HEAD
+class ProjectMenuController
+{
+
+=======
 use App\Enums\Common\Code;
 use App\Models\ProjectMenu as ProjectMenuModel;
 use Illuminate\Support\Facades\Validator;
@@ -112,4 +117,5 @@ class ProjectMenuController extends BaseController
         }
         $this->response($this->param['status'] == 0 ? '启用成功' : '禁用成功',Code::SUCCESS);
     }
+>>>>>>> 5bb365e2828ceec83c8a52553d6f4c44a1e1785f
 }

@@ -18,7 +18,7 @@ class Base extends Model
     public function lists($map, $p, $row, $order = 'id', $fields = ['*']){
         //TODO::where(['id'=>'','name'=>''])
         $lists = $this->select($fields)->where($map)->forPage($p,$row)->orderBy($order)->get();
-        if ($lists->isEmpty() !== false) {
+        if (empty($lists)) {
             return false;
         }
         $lists = $lists->toArray();
@@ -38,7 +38,7 @@ class Base extends Model
      */
     public function list($map,$order = 'id',$fields = ['*']){
         $lists = $this->select($fields)->where($map)->orderBy($order)->get();
-        if ($lists->isEmpty() !== false) {
+        if (empty($lists)) {
             return false;
         }
         $lists = $lists->toArray();
@@ -54,7 +54,7 @@ class Base extends Model
     public function read($condition,$files = ['*'])
     {
         $info = $this->select($files)->where($condition)->first();
-        if ($info->isEmpty() !== false) {
+        if (empty($info)) {
             return false;
         }
         $info = $info->toArray();

@@ -8,4 +8,5 @@ class Manager extends Base
     protected $table = 'manager';
     //自动维护create_at创建时间 updated_at修改时间
     public $timestamps = true;
+
 }

@@ -8,4 +8,5 @@ class Product extends Base
     protected $table = 'gl_product';
     //自动维护create_at创建时间 updated_at修改时间
     public $timestamps = true;
+
 }

@@ -10,6 +10,7 @@ class Project extends Base
     protected $table = 'gl_project';
     //自动维护create_at创建时间 updated_at修改时间
     public $timestamps = true;
+    protected $dateFormat = 'Y-m-d';
 
     /**
      * @name:获取当前对象不分页列表