From ce841ddf85c48bae32f9e3068403fdfe98ac8711 Mon Sep 17 00:00:00 2001
From: zzw <228544128@qq.com>
Date: 星期三, 07 十月 2026 12:35:09 +0800
Subject: [PATCH] feat: add extension defaults for fault reporting
---
emergency-repair-server/src/main/java/com/emergencyrepair/auth/AuthController.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/emergency-repair-server/src/main/java/com/emergencyrepair/auth/AuthController.java b/emergency-repair-server/src/main/java/com/emergencyrepair/auth/AuthController.java
index 3da7330..3348937 100644
--- a/emergency-repair-server/src/main/java/com/emergencyrepair/auth/AuthController.java
+++ b/emergency-repair-server/src/main/java/com/emergencyrepair/auth/AuthController.java
@@ -58,6 +58,12 @@
data.put("realName", StringUtils.hasText(stringValue(user.get("nickName")))
? stringValue(user.get("nickName")) : username);
data.put("deptName", stringValue(user.get("deptName")));
+ data.put("userId", String.valueOf(user.get("userId")));
+ data.put("deptId", user.get("deptId") == null ? "" : String.valueOf(user.get("deptId")));
+ data.put("engineeringMajor", stringValue(user.get("engineeringMajor")));
+ data.put("teamMajor", stringValue(user.get("teamMajor")));
+ data.put("deptResponsibleXNo", stringValue(user.get("deptResponsibleXNo")));
+ data.put("responsibleXNo", stringValue(user.get("responsibleXNo")));
data.put("roles", systemService.roleCodes(username));
data.put("permissions", systemService.permissionCodes(username));
return Result.ok(data);
@@ -76,6 +82,12 @@
data.put("realName", StringUtils.hasText(stringValue(user.get("nickName")))
? stringValue(user.get("nickName")) : username);
data.put("deptName", stringValue(user.get("deptName")));
+ data.put("userId", String.valueOf(user.get("userId")));
+ data.put("deptId", user.get("deptId") == null ? "" : String.valueOf(user.get("deptId")));
+ data.put("engineeringMajor", stringValue(user.get("engineeringMajor")));
+ data.put("teamMajor", stringValue(user.get("teamMajor")));
+ data.put("deptResponsibleXNo", stringValue(user.get("deptResponsibleXNo")));
+ data.put("responsibleXNo", stringValue(user.get("responsibleXNo")));
data.put("roles", systemService.roleCodes(username));
data.put("permissions", systemService.permissionCodes(username));
return Result.ok(data);
@@ -87,9 +99,13 @@
}
try {
List<Map<String, Object>> rows = jdbcTemplate.query(
- "SELECT u.USER_ID, u.USER_NAME, u.NICK_NAME, u.PASSWORD, u.STATUS, d.DEPT_NAME " +
- "FROM LX.SYS_USER u LEFT JOIN LX.SYS_DEPT d ON d.DEPT_ID = u.DEPT_ID " +
- "WHERE u.USER_NAME = ? AND (u.DEL_FLAG = '0' OR u.DEL_FLAG IS NULL)",
+ "SELECT u.USER_ID, u.USER_NAME, u.NICK_NAME, u.PASSWORD, u.STATUS, u.DEPT_ID, d.DEPT_NAME, "
+ + "ue.ENGINEERING_MAJOR, ue.TEAM_MAJOR, ue.RESPONSIBLE_X_NO AS USER_RESPONSIBLE_X_NO, "
+ + "de.RESPONSIBLE_X_NO AS DEPT_RESPONSIBLE_X_NO "
+ + "FROM LX.SYS_USER u LEFT JOIN LX.SYS_DEPT d ON d.DEPT_ID = u.DEPT_ID "
+ + "LEFT JOIN LX.T_SYS_USER_EXT ue ON ue.USER_ID = u.USER_ID AND (ue.DEL_FLAG = 0 OR ue.DEL_FLAG IS NULL) "
+ + "LEFT JOIN LX.T_SYS_DEPT_EXT de ON de.DEPT_ID = u.DEPT_ID AND (de.DEL_FLAG = 0 OR de.DEL_FLAG IS NULL) "
+ + "WHERE u.USER_NAME = ? AND (u.DEL_FLAG = '0' OR u.DEL_FLAG IS NULL)",
new Object[]{username},
(rs, rowNum) -> {
Map<String, Object> row = new LinkedHashMap<>();
@@ -98,6 +114,12 @@
row.put("nickName", rs.getString("NICK_NAME"));
row.put("password", rs.getString("PASSWORD"));
row.put("status", rs.getString("STATUS"));
+ Object deptId = rs.getObject("DEPT_ID");
+ row.put("deptId", deptId == null ? null : rs.getLong("DEPT_ID"));
+ row.put("engineeringMajor", rs.getString("ENGINEERING_MAJOR"));
+ row.put("teamMajor", rs.getString("TEAM_MAJOR"));
+ row.put("responsibleXNo", rs.getString("USER_RESPONSIBLE_X_NO"));
+ row.put("deptResponsibleXNo", rs.getString("DEPT_RESPONSIBLE_X_NO"));
row.put("deptName", rs.getString("DEPT_NAME"));
return row;
});
--
Gitblit v1.9.1