From 030c68717b948c475630be29127a96309de37eff Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 30 八月 2023 13:52:55 +0800
Subject: [PATCH] 8-30 bug修改
---
sys/src/main/resources/application-dev.yml | 2 +-
user-server/src/main/resources/mapper/UserMapper.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index 62f17fc..8d1afc5 100644
--- a/sys/src/main/resources/application-dev.yml
+++ b/sys/src/main/resources/application-dev.yml
@@ -75,7 +75,7 @@
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
password: null
# redis杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶆绉掞級
- timeout: 1000
+ timeout: 50000
# redis杩炴帴姹犻厤缃�
pool:
# 鏈�澶у彲鐢ㄨ繛鎺ユ暟锛堥粯璁や负8锛岃礋鏁拌〃绀烘棤闄愶級
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index b89ebd9..6b79d8e 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -21,7 +21,7 @@
<select id="getNewPersonnelPage" resultType="map">
SELECT u.`id`, u.`name` username, r.`name` roleName, DATE_FORMAT(u.`create_time`, '%Y-%m-%d') createTime,
- u.`age`,
+ u.`age`, CONCAT(r.`id`, '') roleId,
u.`phone`, u.`email`, u.`job_state` jobState, o.`department`, u.`account`, o.`id` departmentId
FROM `user` u
LEFT JOIN role r
--
Gitblit v1.9.3