From b13284ebaa9529cf89362fd3ed870529803c1837 Mon Sep 17 00:00:00 2001 From: caojia <1301869380@qq.com> Date: Wed, 18 Nov 2026 16:51:40 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=94=AF=E6=8C=81=E5=BA=94?= =?UTF-8?q?=E6=94=B6=E8=B4=A6=E5=8D=95=E6=98=8E=E7=BB=86=E6=8C=89=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E5=92=8C=E4=BA=A7=E5=93=81=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receivable/ArBillController.java | 5 +- .../receivable/ArBillDetailSearchTest.java | 142 ++++++++++++++++++ .../domain/vo/ArBillDetailQuery.java | 16 ++ .../receivable/mapper/ArBillDetailMapper.java | 5 +- .../receivable/service/IArBillService.java | 3 +- .../service/impl/ArBillServiceImpl.java | 8 +- .../mapper/receivable/ArBillDetailMapper.xml | 13 +- .../views/ar/bill/components/BillDetail.vue | 62 +++++++- 8 files changed, 242 insertions(+), 12 deletions(-) create mode 100644 bms-back/bms-admin/src/test/java/com/bms/receivable/ArBillDetailSearchTest.java create mode 100644 bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillDetailQuery.java diff --git a/bms-back/bms-admin/src/main/java/com/bms/web/controller/receivable/ArBillController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/receivable/ArBillController.java index 5d8bb95b..735dd863 100644 --- a/bms-back/bms-admin/src/main/java/com/bms/web/controller/receivable/ArBillController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/receivable/ArBillController.java @@ -31,6 +31,7 @@ import com.bms.receivable.domain.ArBillDetailFee; import com.bms.receivable.domain.ArBillGenerateTask; import com.bms.receivable.domain.ArBillLog; import com.bms.receivable.domain.vo.ArBillActionRequest; +import com.bms.receivable.domain.vo.ArBillDetailQuery; import com.bms.receivable.domain.vo.ArBillGenerateQuery; import com.bms.receivable.domain.vo.ArBillGenerateRequest; import com.bms.receivable.domain.vo.ArBillListExportRow; @@ -141,9 +142,9 @@ public class ArBillController extends BaseController { */ @PreAuthorize("@ss.hasPermi('ar:bill:query')") @GetMapping("/{arBillId}/details") - public TableDataInfo details(@PathVariable Long arBillId) { + public TableDataInfo details(@PathVariable Long arBillId, @Valid ArBillDetailQuery query) { startPage(); - return getDataTable(billService.selectArBillDetails(arBillId)); + return getDataTable(billService.selectArBillDetails(arBillId, query)); } /** diff --git a/bms-back/bms-admin/src/test/java/com/bms/receivable/ArBillDetailSearchTest.java b/bms-back/bms-admin/src/test/java/com/bms/receivable/ArBillDetailSearchTest.java new file mode 100644 index 00000000..e7771386 --- /dev/null +++ b/bms-back/bms-admin/src/test/java/com/bms/receivable/ArBillDetailSearchTest.java @@ -0,0 +1,142 @@ +package com.bms.receivable; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; + +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +import com.bms.receivable.domain.ArBillDetail; +import com.bms.receivable.domain.vo.ArBillDetailQuery; +import com.bms.receivable.mapper.ArBillDetailMapper; +import com.bms.receivable.security.ArBillRowScope; +import com.bms.receivable.security.ArBillScopeResolver; +import com.bms.receivable.service.impl.ArBillServiceImpl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.parser.defaults.DefaultCountSqlParser; +import org.apache.ibatis.builder.xml.XMLMapperBuilder; +import org.apache.ibatis.mapping.BoundSql; +import org.apache.ibatis.session.Configuration; +import org.junit.jupiter.api.Test; +import org.springframework.test.util.ReflectionTestUtils; + +class ArBillDetailSearchTest { + @Test + void numberSearchUsesExactMatchesAndCannotBypassBillOrPermissionScope() throws Exception { + ArBillDetailQuery query = new ArBillDetailQuery(); + query.setOrderKeyword("00123' OR 1=1 --"); + BoundSql bound = detailSql(query, scope(false, true)); + String sql = normalized(bound.getSql()); + assertTrue(sql.contains("where ar_bill_id = ?")); + assertTrue(sql.contains("and (order_no = ? or tracking_no = ? or transfer_no = ?)")); + assertTrue(sql.contains("b.ar_bill_id = ar_bill_detail.ar_bill_id")); + assertTrue(sql.contains("c.customer_id = b.customer_id")); + assertTrue(sql.contains("su.user_id = ?")); + assertFalse(sql.contains("order_no like")); + assertFalse(sql.contains(query.getOrderKeyword())); + assertEquals(3, bound.getParameterMappings().stream() + .filter(parameter -> parameter.getProperty().equals("query.orderKeyword")).count()); + } + + @Test + void productSearchAndPaginationCountApplyBothFiltersAndTheSameScope() throws Exception { + ArBillDetailQuery query = new ArBillDetailQuery(); + query.setOrderKeyword("ORDER001"); + query.setProductKeyword("荷兰"); + String sql = normalized(detailSql(query, scope(false, true)).getSql()); + assertTrue(sql.contains("and (product_code like concat('%', ?, '%') or product_name like concat('%', ?, '%'))")); + String count = normalized(new DefaultCountSqlParser().getSmartCountSql(sql, "0")); + assertTrue(count.startsWith("select count(0)")); + assertTrue(count.contains("ar_bill_id = ?")); + assertTrue(count.contains("order_no = ?")); + assertTrue(count.contains("tracking_no = ?")); + assertTrue(count.contains("transfer_no = ?")); + assertTrue(count.contains("product_code like")); + assertTrue(count.contains("product_name like")); + assertTrue(count.contains("su.user_id = ?")); + } + + @Test + void noSearchKeepsExistingQueryAndDeniedScopeRemainsDenied() throws Exception { + for (ArBillDetailQuery query : new ArBillDetailQuery[]{null, new ArBillDetailQuery()}) { + String sql = normalized(detailSql(query, scope(false, false)).getSql()); + assertFalse(sql.contains("order_no = ?")); + assertFalse(sql.contains("product_code like")); + assertTrue(sql.contains("and 1 = 0")); + assertTrue(sql.contains("where ar_bill_id = ?")); + assertTrue(sql.endsWith("order by detail_no")); + } + } + + @Test + void serviceTrimsSearchAndPreservesPaginationForTheScopedDetailQuery() { + ArBillServiceImpl service = new ArBillServiceImpl(); + ArBillDetailMapper details = mock(ArBillDetailMapper.class); + ArBillScopeResolver resolver = mock(ArBillScopeResolver.class); + ArBillRowScope scope = mock(ArBillRowScope.class); + ReflectionTestUtils.setField(service, "detailMapper", details); + ReflectionTestUtils.setField(service, "billScope", resolver); + when(resolver.resolve()).thenReturn(scope); + List result = List.of(new ArBillDetail()); + when(details.selectByBillIdScoped(eq(7L), any(), same(scope))).thenAnswer(invocation -> { + ArBillDetailQuery query = invocation.getArgument(1); + assertEquals("000123", query.getOrderKeyword()); + assertEquals("荷兰", query.getProductKeyword()); + assertEquals(3, PageHelper.getLocalPage().getPageNum()); + return result; + }); + ArBillDetailQuery query = new ArBillDetailQuery(); + query.setOrderKeyword(" 000123 "); + query.setProductKeyword(" 荷兰 "); + PageHelper.startPage(3, 10); + try { + assertSame(result, service.selectArBillDetails(7L, query)); + verify(details).selectByBillIdScoped(eq(7L), any(), same(scope)); + verifyNoMoreInteractions(details); + } finally { + PageHelper.clearPage(); + } + } + + @Test + void wholeBillExportQueryDoesNotInheritDetailSearchFilters() throws Exception { + String sql = normalized(configuration().getMappedStatement("com.bms.receivable.mapper.ArBillDetailMapper.selectExportPage") + .getBoundSql(Map.of("arBillId", 7L, "lastDetailNo", 0, "pageSize", 2000)).getSql()); + assertTrue(sql.contains("where ar_bill_id = ? and detail_no > ?")); + assertFalse(sql.contains("order_no = ?")); + assertFalse(sql.contains("product_code like")); + assertTrue(sql.endsWith("limit ?")); + } + + private BoundSql detailSql(ArBillDetailQuery query, Map scope) throws Exception { + Map parameters = new HashMap<>(); + parameters.put("arBillId", 7L); + parameters.put("query", query); + parameters.put("scope", scope); + return configuration().getMappedStatement("com.bms.receivable.mapper.ArBillDetailMapper.selectByBillIdScoped") + .getBoundSql(parameters); + } + + private Configuration configuration() throws Exception { + Configuration configuration = new Configuration(); + configuration.getTypeAliasRegistry().registerAlias("ArBillDetail", ArBillDetail.class); + for (String resource : List.of("mapper/receivable/ArBillScopeMapper.xml", "mapper/receivable/ArBillDetailMapper.xml")) { + try (InputStream input = getClass().getClassLoader().getResourceAsStream(resource)) { + new XMLMapperBuilder(input, configuration, resource, configuration.getSqlFragments()).parse(); + } + } + return configuration; + } + + private Map scope(boolean all, boolean self) { + return Map.of("all", all, "self", self, "department", false, "userId", 9L, "deptId", 10L); + } + + private String normalized(String sql) { + return sql.replaceAll("\\s+", " ").trim().toLowerCase(Locale.ROOT); + } +} diff --git a/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillDetailQuery.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillDetailQuery.java new file mode 100644 index 00000000..5c0ba0ef --- /dev/null +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillDetailQuery.java @@ -0,0 +1,16 @@ +package com.bms.receivable.domain.vo; + +import jakarta.validation.constraints.Size; +import lombok.Data; + +/** 当前账单内的明细筛选条件;账单范围和数据权限由后端独立传入。 */ +@Data +public class ArBillDetailQuery { + /** 完整订单号、运单号或转单号,按等值匹配。 */ + @Size(max = 64, message = "单号不能超过64个字符") + private String orderKeyword; + + /** 产品代码或名称,按包含关系匹配。 */ + @Size(max = 100, message = "产品搜索条件不能超过100个字符") + private String productKeyword; +} diff --git a/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillDetailMapper.java b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillDetailMapper.java index 88f07e5b..9e322afb 100644 --- a/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillDetailMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillDetailMapper.java @@ -7,9 +7,12 @@ import java.util.Map; import org.apache.ibatis.annotations.Param; import com.bms.receivable.domain.ArBillDetail; +import com.bms.receivable.domain.vo.ArBillDetailQuery; public interface ArBillDetailMapper { - List selectByBillIdScoped(@Param("arBillId") Long arBillId, @Param("scope") ArBillRowScope scope); + List selectByBillIdScoped(@Param("arBillId") Long arBillId, + @Param("query") ArBillDetailQuery query, + @Param("scope") ArBillRowScope scope); List selectByBillId(Long arBillId); diff --git a/bms-back/bms-system/src/main/java/com/bms/receivable/service/IArBillService.java b/bms-back/bms-system/src/main/java/com/bms/receivable/service/IArBillService.java index defa13b5..846bfaea 100644 --- a/bms-back/bms-system/src/main/java/com/bms/receivable/service/IArBillService.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/service/IArBillService.java @@ -15,6 +15,7 @@ import com.bms.receivable.domain.vo.ArBillGenerateRequest; import com.bms.receivable.domain.vo.ArBillGenerateQuery; import com.bms.receivable.domain.vo.ArBillActionRequest; import com.bms.receivable.domain.vo.ArBillQuery; +import com.bms.receivable.domain.vo.ArBillDetailQuery; import com.bms.receivable.domain.vo.ArBillSummary; import com.bms.receivable.domain.vo.ArBillExportTemplateOption; import com.bms.receivable.security.ArBillRowScope; @@ -33,7 +34,7 @@ public interface IArBillService ArBill selectArBillById(Long arBillId); - List selectArBillDetails(Long arBillId); + List selectArBillDetails(Long arBillId, ArBillDetailQuery query); List selectArBillDetailFees(Long arBillId, Long detailId); diff --git a/bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBillServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBillServiceImpl.java index fb2326ea..1d43b40c 100644 --- a/bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBillServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBillServiceImpl.java @@ -76,6 +76,7 @@ import com.bms.receivable.domain.vo.ArBillActionRequest; import com.bms.receivable.domain.vo.ArBillGenerateQuery; import com.bms.receivable.domain.vo.ArBillGenerateRequest; import com.bms.receivable.domain.vo.ArBillQuery; +import com.bms.receivable.domain.vo.ArBillDetailQuery; import com.bms.receivable.domain.vo.ArBillSummary; import com.bms.receivable.domain.vo.ArBillExportTemplateOption; import com.bms.receivable.export.ArBillWorkbookWriters; @@ -210,9 +211,12 @@ public class ArBillServiceImpl implements IArBillService { * 查询账单明细,分页由 Controller 层的 startPage 统一接管。 */ @Override - public List selectArBillDetails(Long arBillId) { + public List selectArBillDetails(Long arBillId, ArBillDetailQuery query) { long startedAt = System.nanoTime(); - List details = detailMapper.selectByBillIdScoped(arBillId, billScope.resolve()); + ArBillDetailQuery normalized = query == null ? new ArBillDetailQuery() : query; + normalized.setOrderKeyword(StringUtils.trim(normalized.getOrderKeyword())); + normalized.setProductKeyword(StringUtils.trim(normalized.getProductKeyword())); + List details = detailMapper.selectByBillIdScoped(arBillId, normalized, billScope.resolve()); log.debug("应收账单明细查询完成,arBillId={}, resultCount={}, costMs={}", arBillId, details.size(), elapsedMillis(startedAt)); return details; diff --git a/bms-back/bms-system/src/main/resources/mapper/receivable/ArBillDetailMapper.xml b/bms-back/bms-system/src/main/resources/mapper/receivable/ArBillDetailMapper.xml index 710ffbaf..09918306 100644 --- a/bms-back/bms-system/src/main/resources/mapper/receivable/ArBillDetailMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/receivable/ArBillDetailMapper.xml @@ -51,7 +51,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" product_code, product_name, goods_description, country_code, country_name, dest_postcode, actual_weight, receive_weight, volume_weight, charge_weight, freight_rate, registration_fee, pkg_length, pkg_width, pkg_height, currency, total_amount, product_amount, redline_amount, billing_fail_status, remark, create_by, create_time - from ar_bill_detail where ar_bill_id = #{arBillId} AND EXISTS (SELECT 1 FROM ar_bill b WHERE b.ar_bill_id = ar_bill_detail.ar_bill_id ) + from ar_bill_detail + where ar_bill_id = #{arBillId} + + and (order_no = #{query.orderKeyword} + or tracking_no = #{query.orderKeyword} + or transfer_no = #{query.orderKeyword}) + + + and (product_code like concat('%', #{query.productKeyword}, '%') + or product_name like concat('%', #{query.productKeyword}, '%')) + + AND EXISTS (SELECT 1 FROM ar_bill b WHERE b.ar_bill_id = ar_bill_detail.ar_bill_id ) order by detail_no diff --git a/bms-front/src/views/ar/bill/components/BillDetail.vue b/bms-front/src/views/ar/bill/components/BillDetail.vue index 87ebd515..0051d12d 100644 --- a/bms-front/src/views/ar/bill/components/BillDetail.vue +++ b/bms-front/src/views/ar/bill/components/BillDetail.vue @@ -19,6 +19,20 @@
账单明细({{ detail.orderCount || 0 }})
+ + + + + + + + + 搜索 + 重置 + +