Merge branch 'hotfix-20230727-scorepackagelist' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -2793,7 +2793,8 @@ public class WmScorePackageController {
 				.between(start != null && end != null, "p.create_time", start, end);
 
 		if (StrUtil.isNotBlank(scorePackageName)){
-			queryWrapper.like( "p.score_package_name", scorePackageName).or().like( "p.pkg_sn", scorePackageName);
+//			queryWrapper.like( "p.score_package_name", scorePackageName).or().like( "p.pkg_sn", scorePackageName);
+			queryWrapper.and(wrapper -> wrapper.like( "p.score_package_name", scorePackageName).or().like( "p.pkg_sn", scorePackageName));
 		}
 
 		if (StringUtil.isEmpty(typeId)) {