mirror of
https://gitee.com/myxzgzs/boyue-vue-pro.git
synced 2025-08-08 08:22:45 +08:00
3b2a3dd0ea
- 修复ErpSaleStatisticsMapper.xml中硬编码使用getRequiredTenantId()导致的空指针异常 - 修复ErpPurchaseStatisticsMapper.xml中硬编码使用getRequiredTenantId()导致的空指针异常 - 使用条件判断getTenantId() != null来决定是否添加租户条件 - 添加单元测试验证多租户开启和关闭时的统计查询功能 - 确保向后兼容，多租户开启时正常工作，关闭时不报错
29 lines
1.4 KiB
XML
29 lines
1.4 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
|
<mapper namespace="cn.iocoder.yudao.module.erp.dal.mysql.statistics.ErpPurchaseStatisticsMapper">
|
|
|
|
<select id="getPurchasePrice" resultType="java.math.BigDecimal">
|
|
SELECT
|
|
(SELECT IFNULL(SUM(total_price), 0)
|
|
FROM erp_purchase_in
|
|
WHERE in_time >= #{beginTime}
|
|
<if test="endTime != null">
|
|
AND in_time < #{endTime}
|
|
</if>
|
|
<if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
|
|
AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
|
|
</if>
|
|
AND deleted = 0) -
|
|
(SELECT IFNULL(SUM(total_price), 0)
|
|
FROM erp_purchase_return
|
|
WHERE return_time >= #{beginTime}
|
|
<if test="endTime != null">
|
|
AND return_time < #{endTime}
|
|
</if>
|
|
<if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
|
|
AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
|
|
</if>
|
|
AND deleted = 0)
|
|
</select>
|
|
|
|
</mapper> |