Merge branch 'master-tiande' into dev-tiande

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/GoodSearchDTO.java

@@ -24,6 +24,15 @@ public class GoodSearchDTO extends PageParam {
 	//商品名
 	@ApiModelProperty(value = "标签id")
 	private String tagId;
+
+
+	@ApiModelProperty("公司id")
+	private Long corporationId;
+
+
+
+	@ApiModelProperty("门店id")
+	private Integer companyId;
 	
 
 	

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

@@ -117,6 +117,12 @@
             <if test="params.name != null and params.name != ''">
                 and (g.`name` like CONCAT('%',#{params.name},'%') or g.introduce like CONCAT('%',#{params.name},'%'))
             </if>
+            <if test="params.companyId != null and params.companyId > 0">
+                and g.company_id=#{params.companyId}
+            </if>
+            <if test="params.corporationId != null and params.corporationId > 0 ">
+                and g.corporation_id=#{params.corporationId}
+            </if>
             <if test="params.tagId != null and params.tagId != '' ">
                 and g.id in (SELECT good_id from tour_good_tag
                 where tag_id = #{params.tagId} and is_del=0 )