Merge remote-tracking branch 'origin/HQPT_USER' into HQPT_USER

@@ -180,7 +180,7 @@
       and role_name = #{roleName, jdbcType=VARCHAR}
       and role_name = #{roleName, jdbcType=VARCHAR}
     </if>
     </if>
     <if test="type != ''  and type !=null">
     <if test="type != ''  and type !=null">
-      and type = #{type, jdbcType=VARCHAR}
+      and type like '%' #{type} '%'
     </if>
     </if>
   </select>
   </select>
   <select id="findRolesByUserId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
   <select id="findRolesByUserId" parameterType="java.lang.Integer" resultMap="BaseResultMap">