用户api修改

Author: coder-hxl

src/service/user/types.ts

@@ -1,13 +1,20 @@
 import type { ResultSetHeader } from 'mysql2'
 import type { IUser } from '../types'
 
+interface IUserList extends IUser {
+ departmentId: number
+ departmentName: string
+ roleId: number
+ roleName: string
+}
+
 interface IUserService {
  create(userInfo: IUser): Promise<ResultSetHeader>
  delete(userId: string): Promise<ResultSetHeader>
  update(id: string | number, updateInfo: IUser): Promise<ResultSetHeader>
- getUserByAny(key: string, value: string): Promise<IUser[]>
  getUserByID(userId: string): Promise<IUser>
- getUserList(like: IUser, limit: string[]): Promise<IUser[]>
+ getUserList(like: IUser, limit: string[]): Promise<IUserList[]>
+ getUserByAny(key: string, value: string): Promise<IUser[]>
 }
 
 export { IUserService }

src/service/user/userService.ts

@@ -37,13 +37,6 @@ const userService: IUserService = {
 
  return result
  },
- async getUserByAny(key, value) {
- const statement = `SELECT * FROM users WHERE ${key} = ?;`
-
- const [result] = await pool.execute<any>(statement, [value])
-
- return result
- },
  async getUserByID(userId) {
  const statement = `
  SELECT
@@ -71,7 +64,9 @@ const userService: IUserService = {
  const sqlLimit = limit.length ? `LIMIT ?, ?` : ''
  const statement = `
  SELECT
- u.id, u.name, u.realname, u.cellphone, u.enable, d.name department, r.name role, u.createAt, u.updateAt
+ u.id, u.name, u.realname, u.cellphone, u.enable, d.id departmentId,
+ d.name departmentName, r.id roleId, r.name roleName,
+ u.createAt, u.updateAt
  FROM users u
  LEFT JOIN department d ON d.id = u.departmentId
  LEFT JOIN role r ON r.id = u.roleId
@@ -81,6 +76,13 @@ const userService: IUserService = {
 
  const [result] = await pool.execute<any[]>(statement, limit)
 
+ return result
+ },
+ async getUserByAny(key, value) {
+ const statement = `SELECT * FROM users WHERE ${key} = ?;`
+
+ const [result] = await pool.execute<any>(statement, [value])
+
  return result
  }
 }