diff --git a/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java b/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java
index f30e5d8..4418b51 100644
--- a/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java
+++ b/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java
@@ -41,6 +41,7 @@ public class AppShipinquanController {
         return service.findPage(page,limit,entity);
     }
 
+
     @PostMapping("/add")
     @ApiOperation("添加视频内容")
     public Result add(@RequestBody BlShipinquan BlShipinquan){
diff --git a/src/main/java/com/sqx/modules/shipinquan/entity/BlShipinquan.java b/src/main/java/com/sqx/modules/shipinquan/entity/BlShipinquan.java
index bf0014c..8fd2f86 100644
--- a/src/main/java/com/sqx/modules/shipinquan/entity/BlShipinquan.java
+++ b/src/main/java/com/sqx/modules/shipinquan/entity/BlShipinquan.java
@@ -36,4 +36,22 @@ public class BlShipinquan implements Serializable {
     @TableField(exist = false)
     private String sfdz;//是否点赞（0未点赞  1点赞）
 
+    @TableField(exist = false)
+    private String parType;//1推荐视频  2附近视频  3关注视频
+    /**
+     * 经度
+     */
+    @TableField(exist = false)
+    private String longitude;
+    /**
+     * 纬度
+     */
+    @TableField(exist = false)
+    private String latitude;
+
+    @TableField(exist = false)
+    private String userId;
+
+
+
 }
diff --git a/src/main/resources/mapper/shipinquan/ShipinquanDao.xml b/src/main/resources/mapper/shipinquan/ShipinquanDao.xml
index 7cff553..f78d6d6 100644
--- a/src/main/resources/mapper/shipinquan/ShipinquanDao.xml
+++ b/src/main/resources/mapper/shipinquan/ShipinquanDao.xml
@@ -30,18 +30,30 @@
             a.pls,
             a.type,
             a.pic_path,
+            (st_distance (point (b.longitude, b.latitude),point('125.377434','43.872621') ) *111195) as distance,
             b.artificer_id as create_by,
             b.artificer_img AS artificerImg,
             if(c.id is null,0,1) as sfdz
         FROM bl_shipinquan a
         left join artificer b on a.create_by = b.user_id
-        left join bl_shipinquan_dianzan c on a.id = b.user_id
+        left join bl_shipinquan_dianzan c on a.id = b.user_id <if test="params.userId!=null and params.userId!=''">and c.create_by = #{params.userId}</if>
+        left join collect_artificer d on b.artificer_id = d.artificer_id
         <where>
+            <if test="params.userId!=null and params.userId!=''">
+                and d.user_id = #{params.userId}
+            </if>
             <if test="params.createBy!=null and params.createBy!=''">
                 and a.create_by = #{params.createBy}
             </if>
         </where>
-        order by create_time desc
+
+        <if test="params.longitude!=null and params.longitude!='' and params.latitude!=null and params.latitude!=''">
+            order by (st_distance (point (b.longitude, b.latitude),point(#{params.longitude},#{params.longitude}) ) *111195) asc,create_time desc
+        </if>
+        <if test="params.longitude==null or params.longitude=='' or params.latitude==null or params.latitude==''">
+            order by create_time desc
+        </if>
+
     </select>
 
 </mapper>
\ No newline at end of file