Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/admin/TourGoodAdminController.java

@@ -47,7 +47,7 @@ public class TourGoodAdminController extends BaseController<TourGoodBiz, TourGoo
 
 
     @ApiOperation("后台旅游上下架")
-    @RequestMapping(value = "/admin/upStatus", method = RequestMethod.POST)
+    @RequestMapping(value = "/admin/upStatus", method = RequestMethod.GET)
     public ObjectRestResponse upStatus(
             @RequestParam(value = "id",defaultValue = "0")Integer id,
             @RequestParam(value = "status",defaultValue = "1")Integer status) {

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodMapper.xml

@@ -52,7 +52,7 @@
     <!--查询旅游路线列表-->
     <select id="getGoodList" parameterType="java.util.Map" resultMap="tourGoodMap">
         SELECT * from tour_good t
-        where  1=1
+        where  t.is_del=1 AND  t.g.status=1
         <if test="params.query != null and params.query != ''">
             and (t.`name` like CONCAT('%',#{params.query},'%') or t.introduce like CONCAT('%',#{params.query},'%'))
         </if>
@@ -85,6 +85,7 @@
         LEFT JOIN tour_good_tag tag ON g.id=tag.good_id
         LEFT JOIN tour_tag t ON tag.tag_id=t.id
         <where>
+            g.is_del=0
         <if test="params.name != null and params.name != ''">
             and (g.`name` like CONCAT('%',#{params.name},'%') or g.introduce like CONCAT('%',#{params.name},'%'))
         </if>