From 343e9068c7f7196de79ef330d8235e06e601180c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 22 十月 2026 20:41:34 +0800
Subject: [PATCH] fix(account): 修正创建人字段类型并优化客户查询显示

---
 src/main/resources/mapper/basic/CustomerMapper.xml                 |    8 ++++----
 src/main/java/com/ruoyi/account/pojo/financial/AccountSubject.java |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/account/pojo/financial/AccountSubject.java b/src/main/java/com/ruoyi/account/pojo/financial/AccountSubject.java
index 2548a9c..cb80760 100644
--- a/src/main/java/com/ruoyi/account/pojo/financial/AccountSubject.java
+++ b/src/main/java/com/ruoyi/account/pojo/financial/AccountSubject.java
@@ -85,7 +85,7 @@
      */
     @ApiModelProperty("鍒涘缓浜�")
     @TableField(fill = FieldFill.INSERT)
-    private Integer createUser;
+    private String createUser;
 
     /**
      * 鍒涘缓鏃堕棿
diff --git a/src/main/resources/mapper/basic/CustomerMapper.xml b/src/main/resources/mapper/basic/CustomerMapper.xml
index 037cc23..eccb09f 100644
--- a/src/main/resources/mapper/basic/CustomerMapper.xml
+++ b/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
@@ -65,9 +65,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

--
Gitblit v1.9.3