|  | @@ -166,7 +166,7 @@
 | 
											
												
													
														|  |  				AND FIND_IN_SET(organ_id_,#{organId})
 |  |  				AND FIND_IN_SET(organ_id_,#{organId})
 | 
											
												
													
														|  |  			</if>
 |  |  			</if>
 | 
											
												
													
														|  |  			<if test="musicGroupName != null and musicGroupName != ''">
 |  |  			<if test="musicGroupName != null and musicGroupName != ''">
 | 
											
												
													
														|  | -				AND name_ LIKE CONCAT('%',#{musicGroupName},'%')
 |  | 
 | 
											
												
													
														|  | 
 |  | +				AND (name_ LIKE CONCAT('%',#{musicGroupName},'%') or id_ like CONCAT('%',#{musicGroupName},'%'))
 | 
											
												
													
														|  |  			</if>
 |  |  			</if>
 | 
											
												
													
														|  |  			<if test="chargeTypeId != null">
 |  |  			<if test="chargeTypeId != null">
 | 
											
												
													
														|  |  				AND charge_type_id_ = #{chargeTypeId}
 |  |  				AND charge_type_id_ = #{chargeTypeId}
 |