diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalQueries.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalQueries.java index 01c1c91..7dcf333 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalQueries.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalQueries.java @@ -72,11 +72,18 @@ public class RentalQueries { } require(page > 0 && page <= 10000, "页码不合法"); args.add((page - 1) * 50); + // 资金账户列表补充所属用户名;左连接保留关联用户缺失的账户,归属过滤仍使用账户的user_id。 + String select = "r.*"; + String join = ""; + if ("account".equals(type)) { + select += ", u.user_name AS user_name"; + join = " LEFT JOIN sys_user u ON u.user_id=r.user_id"; + } List> rows = store.rows( - "SELECT r.* FROM " + "SELECT " + select + " FROM " + table - + " r WHERE (" + + " r" + join + " WHERE (" + where + ") ORDER BY r.id DESC LIMIT 50 OFFSET ?", args.toArray());