Merge remote-tracking branch 'origin/master'

bonus-admin/src/main/resources/mapper/FilesClassifyNameStandardMapper.xml

@@ -64,6 +64,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		FROM da_ky_files_classify_name_standard dkfcns
 				 LEFT JOIN da_ky_sys_dict_data dksdd ON dkfcns.standard_type = dksdd.dict_value and dksdd.dict_type = 'files_classify_name_standard_type'
 		WHERE dkfcns.del_flag = '1'
+		<if test="standardType != null and standardType != ''">
+			AND INSTR(dksdd.dict_label, #{standardType}) > 0
+		</if>
 		ORDER BY dkfcns.create_time DESC
 	</select>
 	<select id="selectClassifyNameStandard" resultType="java.lang.Integer">