Merge branch 'dev' into 'master'

banner列表增加图片名称查询条件

See merge request !5

cloud-site-api/src/main/java/com/yizhi/site/application/vo/site/SiteComponyIdVO.java

@@ -21,6 +21,9 @@ public class SiteComponyIdVO {
 	@ApiModelProperty(value = "应用名称")
 	@ApiModelProperty(value = "应用名称")
 	private String terminalName;
 	private String terminalName;
 	
 	
+	@ApiModelProperty(value = "图片名称")
+	private String imgTitle;
+	
 	@ApiModelProperty(value = "状态， 1 上架， 2 下架  , 3  全部")
 	@ApiModelProperty(value = "状态， 1 上架， 2 下架  , 3  全部")
 	private Integer state;
 	private Integer state;
 	
 	

cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/PortalBannerServiceImpl.java

@@ -300,6 +300,7 @@ public class PortalBannerServiceImpl extends ServiceImpl<PortalBannerMapper, Por
         map.put("companyId", companyId);
         map.put("companyId", companyId);
         map.put("terminalName", terminalName);
         map.put("terminalName", terminalName);
         map.put("stateList", stateList);
         map.put("stateList", stateList);
+        map.put("imgTitle", siteComponyIdVO.getImgTitle());
         Page<PortalBannerVo> page = new Page<PortalBannerVo>(pageNo, pageSize);
         Page<PortalBannerVo> page = new Page<PortalBannerVo>(pageNo, pageSize);
         listPortal = portalBannerMapper.selectPortalBanner(page, map);
         listPortal = portalBannerMapper.selectPortalBanner(page, map);
 
 

cloud-site-service/src/main/resources/mapper/PortalBannerMapper.xml

@@ -65,6 +65,9 @@
 	            #{item}
 	            #{item}
 			</foreach>
 			</foreach>
 		</if>
 		</if>
+		<if test="imgTitle!=null and imgTitle!=''">
+		    and a.img_title LIKE CONCAT('%', #{imgTitle}, '%')
+		</if>
 		 order by a.sort desc
 		 order by a.sort desc
   	</select>
   	</select>