'1-6'

@@ -52,6 +52,7 @@ class User extends BaseApi
             "brief": "个人简介",
             "show_array":"显示字段",
             "is_ok_arr":"获取可以显示隐藏的字段",
+            "is_expert":"是否是专家:0=不是,1=是",
             "createtime": 0,
             "updatetime": 1608086439,
             "url": "/u/1"
@@ -169,6 +170,77 @@ class User extends BaseApi
     }
 
 
+    /**
+     * 我的动态
+     * @ApiTitle    (我的动态)
+     * @ApiMethod   (POST)
+     * @ApiRoute    (/api/user/articleList)
+     * @ApiParams   (name="page", type="integer", required=true, description="分页次数")
+     * @ApiParams   (name="num", type="integer", required=true, description="分页数量")
+     * @ApiParams   (name="user_id", type="integer", required=true, description="用户id")
+     * @ApiReturnParams   (name="code", type="integer", required=true, sample="0")
+     * @ApiReturnParams   (name="msg", type="string", required=true, sample="返回成功")
+     * @ApiReturnParams   (name="data", type="object", description="扩展数据返回")
+     * @ApiReturn   ({
+        "code": 1,
+        "msg": "查询数据成功",
+        "time": "1608857680",
+        "data": [
+        {
+            "id": 9,
+            "user_id": 1,
+            "article_category_id": 7,
+            "content": "内",
+            "images": [
+                "http://qldk2g57y.hn-bkt.clouddn.com/uploads/20201221/667431fe2f31e5d0e76344ba7545ea20.jpg"
+            ],
+            "createtime": "2020-12-24 15:13:48",
+            "updatetime": "2020-12-24 15:13:48",
+            "deletetime": null,
+            "message": null,
+            "is_friend": "是否是好友 1=是 0=不是",
+            "str_time": "首页显示时间"
+        }
+        ]
+        })
+     */
+    public function articleList(){
+        //1.获取数据
+        $data = $this->get_data_array([
+            ['page','分页次数不能为空'],
+            ['num','分页数量不能为空'],
+            ['user_id','用户id不能为空'],
+        ]);
+        //2.获取列表数据
+        $art_list = model('article')
+            ->where('user_id',$data['user_id'])
+            ->where('deletetime',null)
+            ->with(['user'])
+            ->order('createtime','desc')
+            ->page($data['page'],$data['num'])
+            ->select();
+        //3.判断是不是好友
+        $user_id = $this->auth->id;
+        if (!empty($art_list)){
+            foreach ($art_list as $key => $val){
+                //1.查询关注和被关注
+                $attention = model('user_attention')->where(function ($query) use ($val,$user_id){
+                    $query->where('user_id',$user_id)->where('in_user_id',$val['user_id']);
+                })->whereOr(function ($query) use ($val,$user_id){
+                    $query->where('user_id',$val['user_id'])->where('in_user_id',$user_id);
+                })->count();
+                if ($attention == 2){
+                    $art_list[$key]['is_friend'] = 1;
+                }else{
+                    $art_list[$key]['is_friend'] = 0;
+                }
+            }
+        }
+        $this->success('查询数据成功',$art_list);
+    }
+
+
+
 
 
 
@@ -176,9 +248,10 @@ class User extends BaseApi
      * 我的作品
      * @ApiTitle    (我的作品)
      * @ApiMethod   (POST)
-     * @ApiRoute    (/api/production/ProductionList)
+     * @ApiRoute    (/api/user/ProductionList)
      * @ApiParams   (name="page", type="integer", required=true, description="分页次数")
      * @ApiParams   (name="num", type="integer", required=true, description="分页数量")
+     * @ApiParams   (name="user_id", type="integer", required=true, description="用户id")
      * @ApiReturnParams   (name="code", type="integer", required=true, sample="0")
      * @ApiReturnParams   (name="msg", type="string", required=true, sample="返回成功")
      * @ApiReturnParams   (name="data", type="object", description="扩展数据返回")
@@ -217,10 +290,11 @@ class User extends BaseApi
         $data = $this->get_data_array([
             ['page','分页次数不能为空'],
             ['num','分页数量不能为空'],
+            ['user_id','用户id不能为空']
         ]);
         //2.获取列表数据
         $Pro_list = model('production')
-            ->where('user_id',$this->auth->id)
+            ->where('user_id',$data['user_id'])
             ->order('createtime','desc')
             ->page($data['page'],$data['num'])
             ->select();
@@ -265,6 +339,7 @@ class User extends BaseApi
      * @ApiRoute    (/api/user/getExhibition)
      * @ApiParams   (name="page", type="integer", required=true, description="分页次数")
      * @ApiParams   (name="num", type="integer", required=true, description="分页数量")
+     * @ApiParams   (name="user_id", type="integer", required=true, description="用户id")
      * @ApiReturnParams   (name="code", type="integer", required=true, sample="0")
      * @ApiReturnParams   (name="msg", type="string", required=true, sample="返回成功")
      * @ApiReturnParams   (name="data", type="object", description="扩展数据返回")
@@ -275,11 +350,13 @@ class User extends BaseApi
         $data = $this->get_data_array([
             ['page','分页次数不能为空'],
             ['num','分页数量不能为空'],
+            ['user_id','用户id不能为空']
         ]);
         //2.查询数组
         $exhibition = model('exhibition')
-            ->field('id,images,title,show_num')
+            ->where('user_id',$data['user_id'])
             ->where('status','<>',0)
+            ->field('id,images,title,show_num')
             ->order('createtime','desc')
             ->page($data['page'],$data['num'])
             ->select();

@@ -178,19 +178,22 @@ class User extends Model
      */
     public static function getAuthlistArrayAttr($value,$data)
     {
-        $data = explode(',',$data['authlist']);
+        $data_arr = explode(',',$data['authlist']);
         $re = [];
-        if ($data){
-            if (in_array('1',$data)){
+        if ($data['is_expert'] == 1){
+            $re[] = '专家';
+        }
+        if ($data_arr){
+            if (in_array('1',$data_arr)){
                 $re[] = '书友';
             }
-            if (in_array('2',$data)){
+            if (in_array('2',$data_arr)){
                 $re[] = '书协';
             }
-            if (in_array('3',$data)){
+            if (in_array('3',$data_arr)){
                 $re[] = '书协';
             }
-            if (in_array('4',$data)){
+            if (in_array('4',$data_arr)){
                 $re[] = '企业';
             }
         }