Merge branch 'test' of http://git.lionquexpress.com/wuweihua/BMS into test

bms-back/bms-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml

@@ -45,7 +45,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--    信用额度=总额度+额外额度-已用额度-->
     <sql id="selectBmsCustomerVo">
         select c.customer_id, c.customer_code, c.customer_name, c.customer_code_dw, c.credit_code, c.customer_type,
-               c.is_enable, c.sales_user_id, c.sales_user, c.ed, c.zq, c.settlement_user_id, c.settlement_user,
+               c.is_enable,
+               case when su.user_id is not null then cast(su.user_id as char) else null end as sales_user_id,
+               su.nick_name as sales_user, c.ed, c.zq, c.settlement_user_id, c.settlement_user,
                c.service_user_id, c.service_user, c.settlement_type, c.temp_ed,
                (select coalesce(sum(ca.balance), 0) from ctr_customer_account ca
                  where ca.customer_id = c.customer_id and ca.currency = 'CNY' and ca.del_flag = '0') as account_balance,
@@ -61,11 +63,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                su.nick_name as sales_user_nick_name,
                cps.price_set_id, ps.price_set_name
         from ctr_customer c
-        <!-- sales_user_id 统一存本系统 user_id（同步时由工号转换、手工录入选人即存ID），
-             数据权限按 su.user_id / su.dept_id 控制；保留 user_name 匹配仅作历史未转换工号兜底 -->
+        <!-- sales_user_id 只保存 sys_user.user_id；源工号不参与客户查询和权限匹配。 -->
         left join sys_user su
             on su.del_flag = '0'
-           and (su.user_id = c.sales_user_id + 0 or su.user_name = c.sales_user_id)
+           and cast(su.user_id as char) = c.sales_user_id
         <!-- 客户套餐绑定：uk_customer_one_set 保证一客户至多一条，不会放大行数 -->
         left join prc_customer_price_set cps on cps.customer_id = c.customer_id
         left join prc_price_set ps on ps.price_set_id = cps.price_set_id
@@ -92,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="customerType != null  and customerType != ''"> and c.customer_type = #{customerType}</if>
             <if test="isEnable != null  and isEnable != ''"> and c.is_enable = #{isEnable}</if>
             <if test="salesUserId != null  and salesUserId != ''"> and c.sales_user_id = #{salesUserId}</if>
-            <if test="salesUser != null  and salesUser != ''"> and c.sales_user = #{salesUser}</if>
+            <if test="salesUser != null  and salesUser != ''"> and su.nick_name = #{salesUser}</if>
             <if test="ed != null "> and c.ed = #{ed}</if>
             <if test="zq != null "> and c.zq = #{zq}</if>
             <if test="settlementUserId != null  and settlementUserId != ''"> and c.settlement_user_id = #{settlementUserId}</if>
@@ -111,6 +112,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by c.customer_id desc
     </select>
 
+    <select id="countValidSalesUserId" resultType="int">
+        select count(1)
+        from sys_user
+        where user_id = #{salesUserId}
+          and del_flag = '0'
+    </select>
+
     <select id="selectBmsCustomerByCustomerId" parameterType="Long" resultMap="BmsCustomerResult">
         <include refid="selectBmsCustomerVo"/>
         where c.customer_id = #{customerId} and c.del_flag = '0'

bms-back/bms-system/src/main/resources/mapper/customer/CustomerSyncMapper.xml

@@ -8,22 +8,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT customer_code FROM ctr_customer WHERE del_flag = '0'
     </select>
 
-    <!-- 工号->用户ID 映射（列别名显式映射，项目未开下划线转驼峰） -->
+    <!-- 工号->用户ID 候选；Java 层检测重复工号，不任意取一条。 -->
     <select id="selectUserLoginMap" resultType="com.bms.common.core.domain.entity.SysUser">
         SELECT user_id AS userId, user_name AS userName
           FROM sys_user
          WHERE del_flag = '0'
     </select>
 
-    <!-- 字段集与 scripts/import_customers.py 的 MAP_COLUMNS 保持一致；
-         源行为空的字段不写，走数据库默认值 -->
+    <select id="selectExistingSalesAssignments" resultType="com.bms.customer.customerinfo.domain.BmsCustomer">
+        SELECT customer_code AS customerCode,
+               sales_user_id AS salesUserId,
+               source_sales_code AS sourceSalesCode
+          FROM ctr_customer
+         WHERE del_flag = '0'
+    </select>
+
+    <!-- 普通客户资料沿用源空值不覆盖；业务员ID和源工号始终按本次匹配结果写入，允许明确清空。 -->
     <insert id="insertSyncCustomer" parameterType="com.bms.customer.customerinfo.domain.BmsCustomer">
         INSERT INTO ctr_customer (
             customer_code, customer_name, is_enable,
-            del_flag, create_by
+            del_flag, create_by, sales_user_id, source_sales_code
             <if test="customerCodeDw != null">, customer_code_dw</if>
             <if test="customerType != null">, customer_type</if>
-            <if test="salesUserId != null">, sales_user_id</if>
             <if test="salesUser != null">, sales_user</if>
             <if test="settlementUser != null">, settlement_user</if>
             <if test="serviceUser != null">, service_user</if>
@@ -37,10 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">, create_time</if>
         ) VALUES (
             #{customerCode}, #{customerName}, #{isEnable},
-            '0', #{createBy}
+            '0', #{createBy}, #{salesUserId}, #{sourceSalesCode}
             <if test="customerCodeDw != null">, #{customerCodeDw}</if>
             <if test="customerType != null">, #{customerType}</if>
-            <if test="salesUserId != null">, #{salesUserId}</if>
             <if test="salesUser != null">, #{salesUser}</if>
             <if test="settlementUser != null">, #{settlementUser}</if>
             <if test="serviceUser != null">, #{serviceUser}</if>
@@ -61,7 +66,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="customerName != null">, customer_name = #{customerName}</if>
             <if test="customerCodeDw != null">, customer_code_dw = #{customerCodeDw}</if>
             <if test="customerType != null">, customer_type = #{customerType}</if>
-            <if test="salesUserId != null">, sales_user_id = #{salesUserId}</if>
+            , sales_user_id = #{salesUserId}
+            , source_sales_code = #{sourceSalesCode}
             <if test="salesUser != null">, sales_user = #{salesUser}</if>
             <if test="settlementUser != null">, settlement_user = #{settlementUser}</if>
             <if test="serviceUser != null">, service_user = #{serviceUser}</if>

bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetMapper.xml

@@ -93,8 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                            AND ifnull(c.del_flag, '0') = '0'
                         INNER JOIN sys_user su
                             ON su.del_flag = '0'
-                           AND (su.user_name = c.sales_user_id COLLATE utf8mb4_general_ci
-                                OR su.user_id = c.sales_user_id + 0)
+                           AND cast(su.user_id as char) = c.sales_user_id
                         WHERE cps.price_set_id = s.price_set_id
                         ${params.dataScope}
                     )