gx

@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Bside;
 use App\Enums\Common\Code;
 use App\Helper\Common;
 use App\Http\Controllers\Controller;
-use App\Models\AiCommand as AiCommandModel;
+use App\Models\User\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Exceptions\HttpResponseException;
@@ -159,6 +159,11 @@ class BaseController extends Controller
                     case 'image':
                         $data['image_link'] = url('/b/image/' . $v);
                         break;
+                    case 'operator_id':
+                        if(!empty($v)){
+                            $data['operator_name'] = (new User())->get_name();
+                        }
+
                 }
             }
         }

@@ -5,11 +5,15 @@ namespace App\Http\Controllers\Bside\Blog;
 use App\Enums\Common\Code;
 use App\Helper\Common;
 use App\Http\Controllers\Bside\BaseController;
+use App\Http\Logic\Bside\Blog\BlogCategoryLogic;
 use App\Http\Logic\Bside\Blog\BlogLogic;
-use App\Http\Logic\Bside\News\NewsLogic;
+use App\Http\Logic\Bside\User\UserLogic;
 use App\Http\Requests\Bside\Blog\BlogRequest;
 use App\Models\Blog\Blog as BlogModel;
 use App\Models\Blog\BlogCategory as BlogCategoryModel;
+use App\Models\User\User;
+use App\Models\User\UserLog;
+use App\Models\User\UserLogin;
 use Illuminate\Http\Request;
 class BlogController extends BaseController
 {
@@ -19,21 +23,14 @@ class BlogController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function lists(BlogModel $blogModel){
+    public function lists(BlogModel $blogModel,BlogCategoryLogic $blogCategoryLogic){
         //搜索条件
         $this->map['project_id'] = $this->user['project_id'];
         $lists = $blogModel->lists($this->map,$this->page,$this->row,$this->order);
         if(!empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
-                $blogCategoryModel= new BlogCategoryModel();
-                //获取用户已读还是未读
-                $category_info = $blogCategoryModel->
-                list(['id'=>['in',explode(',',trim($v['category_id'],','))]],'id',['name']);
-                $str = '';
-                foreach ($category_info as $v1){
-                    $str .= $v1['name'].',';
-                }
-                $v['category_name'] = trim($str,',');
+                //获取分类名称
+                $v = $blogCategoryLogic->get_category_name($v);
                 $lists['list'][$k] = $v;
             }
         }

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Bside\News;
 use App\Enums\Common\Code;
 use App\Helper\Common;
 use App\Http\Controllers\Bside\BaseController;
+use App\Http\Logic\Bside\News\NewsCategoryLogic;
 use App\Http\Logic\Bside\News\NewsLogic;
 use App\Http\Requests\Bside\News\NewsRequest;
 use App\Models\News\News as NewsModel;
@@ -22,20 +23,12 @@ class NewsController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function lists(NewsModel $news){
+    public function lists(NewsModel $news,NewsCategoryLogic $newsCategoryLogic){
         $this->map['project_id'] = $this->user['project_id'];
         $lists = $news->lists($this->map,$this->page,$this->row,$this->order);
         if(!empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
-                $newsCategoryModel= new NewsCategoryModel();
-                //获取用户已读还是未读
-                $category_info = $newsCategoryModel->
-                list(['id'=>['in',explode(',',trim($v['category_id'],','))]],'id',['name']);
-                $str = '';
-                foreach ($category_info as $v1){
-                    $str .= $v1['name'].',';
-                }
-                $v['category_name'] = trim($str,',');
+                $v = $newsCategoryLogic->get_category_name($v);
                 $lists['list'][$k] = $v;
             }
         }

@@ -4,6 +4,7 @@ namespace App\Http\Logic\Bside\Blog;
 
 use App\Enums\Common\Code;
 use App\Http\Logic\Bside\BaseLogic;
+use App\Http\Logic\Bside\User\UserLogic;
 use App\Models\Blog\BlogCategory as BlogCategoryModel;
 use App\Models\Blog\Blog as BlogModel;
 use App\Models\News\NewsCategory as NewsCategoryModel;
@@ -19,7 +20,23 @@ class BlogCategoryLogic extends BaseLogic
         $this->param = $this->requestAll;
     }
 
-
+    /**
+     * @param $v
+     * @name :获取分类名称
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function get_category_name($v){
+        //获取用户已读还是未读
+        $category_info = $this->model->list(['id'=>['in',explode(',',trim($v['category_id'],','))]],'id',['name']);
+        $str = '';
+        foreach ($category_info as $v1){
+            $str .= $v1['name'].',';
+        }
+        $v['category_name'] = trim($str,',');
+        return $this->success($v);
+    }
     /**
      * @name :添加时验证上级分类是否有商品，有则替换带当前分类下
      * @return void

@@ -22,6 +22,7 @@ class BlogLogic extends BaseLogic
         $this->model = new Blog();
         $this->param = $this->requestAll;
     }
+
     /**
      * @name :获取分类列表
      * @return array
@@ -191,4 +192,5 @@ class BlogLogic extends BaseLogic
         }
         return $this->success();
     }
+
 }

@@ -20,6 +20,23 @@ class NewsCategoryLogic extends BaseLogic
     }
 
     /**
+     * @param $v
+     * @name :获取分类名称
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function get_category_name($v){
+        //获取用户已读还是未读
+        $category_info = $this->model->list(['id'=>['in',explode(',',trim($v['category_id'],','))]],'id',['name']);
+        $str = '';
+        foreach ($category_info as $v1){
+            $str .= $v1['name'].',';
+        }
+        $v['category_name'] = trim($str,',');
+        return $this->success($v);
+    }
+    /**
      * @name :详情
      * @return array
      * @throws \App\Exceptions\BsideGlobalException

@@ -118,4 +118,5 @@ class UserLogic extends BaseLogic
         }
         return $this->success();
     }
+
 }

@@ -3,8 +3,13 @@
 namespace App\Models\Blog;
 
 use App\Models\Base;
+use App\Models\User\User;
 
 class Blog extends Base
 {
     protected $table = 'gl_blog';
+
+    public function user(){
+        return $this->hasMany(User::class,'operator_id','id');
+    }
 }

@@ -62,7 +62,8 @@ class User extends Base
         if(!isset($param['login_method'])){
             //密码加密
             $param['password'] = base64_encode(md5($param['password']));
-            $info = $this->read(['mobile'=>$param['mobile'],'password'=>$param['password'],'status'=>0], ['*']);
+            $info = $this->read(['mobile'=>$param['mobile']
+                ,'password'=>$param['password'],'status'=>0], ['id','mobile','role_id','token','name']);
         }else{
             //TODO::验证验证码是否正确
             $info = $this->read(['mobile'=>$param['mobile']],['*']);
@@ -119,4 +120,15 @@ class User extends Base
         Cache::pull($info['token']);
         return true;
     }
+
+    /**
+     * @name :获取操作人名称
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function get_name($operator_id = ''){
+        $info = $this->read(['operator_id'=>$operator_id],['name']);
+        return $info['name'];
+    }
 }