Merge branch 'bug' into ljc_1.1

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/NewsController.java

@@ -44,7 +44,10 @@ public class NewsController extends BaseController {
 	@ApiOperation(value = "资讯/广告/闪页/轮播图/乐理 列表分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
 	@PostMapping(value = "/page",  consumes="application/json", produces="application/json")
 	public HttpResponseResult<PageInfo<SysNewsInformationDto>> getList(@Valid @RequestBody NewsInformationQueryInfo queryInfo) {
-		
+
+		if (queryInfo.getType() == 2) {
+			queryInfo.setAttribute2(queryInfo.getSubType());
+		}
 		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
 		return succeed(sysNewsInformationService.selectPage(queryInfo));

cooleshow-cms/src/main/resources/config/mybatis/HelpCenterContentMapper.xml

@@ -28,7 +28,9 @@
 				and content.catalog_id_ in (${catalogIds})
 			</if>
 			<if test="title!= null and title != ''">
-				and content.title_ like '%' #{title} '%'
+				and (content.title_ like '%' #{title} '%'
+					or content.id_ like '%' #{title} '%'
+				)
 			</if>
 			<if test="status!= null">
 			and ((content.status_ = #{status} and content.catalog_id_ = 1)

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysManualMapper.xml

@@ -39,7 +39,7 @@
 				AND menu_id_ = #{menuId}
 			</if>
 			<if test="search != null and search != '' ">
-				AND (sm.name_ like concat('%', #{search} '%') )
+				AND (sm.name_ like concat('%', #{search} '%') or sm.id_  like concat('%', #{search} '%')  or u.phone_ like concat('%', #{search} '%')  )
 			</if>
 		</where>
 		<include refid="global.limit" />