zhangwencui
2026-10-29 b2f8320707dc72b2429bfb4fe0b317c11b1e5b7f
src/main/resources/mapper/basic/CustomerMapper.xml
@@ -9,9 +9,9 @@
    <select id="listPage" resultType="com.ruoyi.basic.vo.CustomerVo">
        select
        c.*,
        u.user_name usage_user_name,
        ifnull(u.nick_name, u.user_name) usage_user_name,
        (
        select group_concat(u2.user_name separator ', ')
        select group_concat(ifnull(u2.nick_name, u2.user_name) separator ', ')
        from customer_user cu
        left join sys_user u2 on cu.user_id = u2.user_id
        where cu.customer_id = c.id
@@ -45,8 +45,9 @@
            </if>
            <!-- 私海查询:type = 0(私海客户)或者 type = 1(公海客户)且已被分配,并且是自己领用、自己创建或者共享给自己的客户 -->
            <if test="c.type != null and c.type == 0">
                and (
                    (type = #{c.type} or (type = 1 and is_assigned = 1))
                and (type = #{c.type} or (type = 1 and is_assigned = 1))
                <!-- loginUserId 为空表示超级管理员,不受领用/共享范围限制 -->
                <if test="loginUserId != null">
                    and (
                        c.usage_user = #{loginUserId}
                        or c.create_user = #{loginUserId}
@@ -56,7 +57,7 @@
                            and cu.user_id = #{loginUserId}
                        )
                    )
                )
                </if>
            </if>
        </where>
        order by c.id desc
@@ -65,9 +66,9 @@
    <select id="list" resultType="com.ruoyi.basic.vo.CustomerVo">
        select
        c.*,
        u.user_name usage_user_name,
        ifnull(u.nick_name, u.user_name) usage_user_name,
        (
        select group_concat(u2.user_name separator ', ')
        select group_concat(ifnull(u2.nick_name, u2.user_name) separator ', ')
        from customer_user cu
        left join sys_user u2 on cu.user_id = u2.user_id
        where cu.customer_id = c.id
@@ -107,8 +108,9 @@
            </if>
            <!-- 私海查询:type = 0(私海客户)或者 type = 1(公海客户)且已被分配,并且是自己领用、自己创建或者共享给自己的客户 -->
            <if test="c.type != null and c.type == 0">
                and (
                    (type = #{c.type} or (type = 1 and is_assigned = 1))
                and (type = #{c.type} or (type = 1 and is_assigned = 1))
                <!-- loginUserId 为空表示超级管理员,不受领用/共享范围限制 -->
                <if test="loginUserId != null">
                    and (
                        c.usage_user = #{loginUserId}
                        or c.create_user = #{loginUserId}
@@ -118,7 +120,7 @@
                            and cu.user_id = #{loginUserId}
                        )
                    )
                )
                </if>
            </if>
        </where>
        order by c.id desc
@@ -128,7 +130,7 @@
               c.customer_name,
               T1.contractAmounts AS contractAmounts,
               IFNULL(T2.receiptPaymentAmount, 0) AS receiptPaymentAmount,
               T1.contractAmounts - (IFNULL(T2.receiptPaymentAmount, 0) - IFNULL(T4.returnAmount, 0)) AS receiptableAmount,
               T1.contractAmounts - IFNULL(T2.receiptPaymentAmount, 0) - IFNULL(T4.returnAmount, 0) AS receiptableAmount,
               IFNULL(T4.returnAmount, 0) AS returnAmount
        from (select customer_id, sum(contract_amount) as contractAmounts from sales_ledger group by customer_id) T1
        left join (select customer_id, sum(collection_amount) as receiptPaymentAmount from account_sales_collection group by customer_id) T2 on T1.customer_id = T2.customer_id
@@ -142,7 +144,7 @@
            where rm.status=1
            group by sl.customer_id
        ) T4 on T4.customer_id=T1.customer_id
        left join customer c on T1.customer_id = c.id
        inner join customer c on T1.customer_id = c.id
        <where>
            <if test="customerName!=null and customerName!=''">
                AND c.customer_name LIKE CONCAT('%', #{customerName}, '%')
@@ -157,7 +159,7 @@
               sl.execution_date,
               sl.contract_amount AS contract_amount,
               IFNULL(T1.receiptPaymentAmount, 0) AS receiptPaymentAmount,
               sl.contract_amount - (IFNULL(T1.receiptPaymentAmount, 0) - IFNULL(T3.returnAmount, 0)) AS receiptableAmount,
               sl.contract_amount - IFNULL(T1.receiptPaymentAmount, 0) - IFNULL(T3.returnAmount, 0) AS receiptableAmount,
               IFNULL(T3.returnAmount, 0) AS returnAmount
        from sales_ledger sl
        left join (