报表查询列表检索条件修改

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/controller/ReportsController.java

@@ -81,12 +81,12 @@ public class ReportsController extends BladeController {
 			.like(ObjectUtils.isNotNull(reports.getCnName()), Reports::getCnName, reports.getCnName())
 			.apply(ObjectUtils.isNotNull(reports.getCode()), "find_in_set(code,'" + reports.getCode() + "')")
 			.apply(ObjectUtils.isNotNull(reports.getGroupCode()), "find_in_set(group_code,'" + reports.getGroupCode() + "')")
-			.apply(ObjectUtils.isNotNull(reports.getBusinessType()), "find_in_set(business_type,'" + reports.getBusinessType() + "')");
-		if ("AMEND".equals(reports.getBusinessType())) {
+			.eq(ObjectUtils.isNotNull(reports.getBusinessType()), Reports::getBusinessType,reports.getBusinessType());
+//		if ("AMEND".equals(reports.getBusinessType())) {
 			lambdaQueryWrapper.apply(ObjectUtils.isNotNull(reports.getClassifyCode()), "find_in_set(classify_code,'" + reports.getClassifyCode() + "')");
-		} else {
+		/*} else {
 			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(reports.getClassifyCode()), Reports::getClassifyCode, reports.getClassifyCode());
-		}
+		}*/
 		if (!AuthUtil.getUserRole().contains("admin")) {
 			String roleIds = AuthUtil.getUser().getRoleId();
 			StringBuilder text = new StringBuilder("(");