From 9db5556eca901cd113a08b29a1bbe0a1c444d4fd Mon Sep 17 00:00:00 2001
From: chenhaojie <hjchencq@isoftstone.com>
Date: Wed, 26 Jun 2024 15:08:23 +0800
Subject: [PATCH] =?UTF-8?q?das=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/SysUserMapper.xml   |   1 -
 docs/api/api_list.md                          | 111 ++++++++++--------
 2 files changed, 64 insertions(+), 48 deletions(-)

diff --git a/das/src/main/resources/mapper/SysUserMapper.xml b/das/src/main/resources/mapper/SysUserMapper.xml
index dc5542c0..08f2623e 100644
--- a/das/src/main/resources/mapper/SysUserMapper.xml
+++ b/das/src/main/resources/mapper/SysUserMapper.xml
@@ -26,7 +26,6 @@
         <result property="email" column="email" jdbcType="VARCHAR"/>
         <result property="phone" column="phone" jdbcType="VARCHAR"/>
         <result property="orgId" column="org_id" jdbcType="VARCHAR"/>
-        <result property="lastLogin" column="last_login" jdbcType="VARCHAR"/>
         <result property="revision" column="revision" jdbcType="VARCHAR"/>
         <collection property="roleList" column="id" ofType="com.das.modules.auth.domain.vo.SysUserRoleVo" select="queryRoleByUserId"/>
     </resultMap>
diff --git a/docs/api/api_list.md b/docs/api/api_list.md
index 1c473fa7..ca2615e2 100644
--- a/docs/api/api_list.md
+++ b/docs/api/api_list.md
@@ -772,35 +772,46 @@
 
 ```json
 {
-    "code":"200",
-    "msg":"调用成功",
-    "data": [
+  "total": 1,
+  "rows": [
     {
-      "id": "xxxx",
-      "account": "xxx",
-      "password": "xxx",
-      "userName": "xxx",
-      "email":"xxx",
-      "phone":"xxx",
-      "orgId":"xxx"
-   },
-    {
-        ...
+      "id": 73238484643741696,
+      "account": "test1",
+      "userName": "测试1",
+      "revision": 1,
+      "phone": "1231212",
+      "email": "测试",
+      "orgId": 1,
+      "roleList": [
+        {
+          "id": 73220290639036416,
+          "roleCode": "1212",
+          "roleName": "测试角色1",
+          "revision": 1
+        },
+        {
+          "id": 73212978522226688,
+          "roleCode": "0011",
+          "roleName": "测试角色",
+          "revision": 1
+        }
+      ]
     }
   ],
-  "success": true
+  "code": 200,
+  "msg": "查询成功"
 }
 ```
 
-| 变量名   | 变量类型 | 可为NULL | 描述               |
-| -------- | -------- | -------- | ------------------ |
-| id       | BIGINT   | No       | 主键(雪花算法生成) |
-| account  | String   | No       | 登录账号           |
-| password | String   | No       | 加密后的密码       |
-| userName | String   | No       | 职员名称           |
-| email    | String   | No       | 职员邮箱           |
-| phone    | String   | No       | 职员联系电话       |
-| orgId    | BIGINT   | No       | 所属机构ID         |
+| 变量名   | 变量类型   | 可为NULL | 描述         |
+| -------- |--------| -------- |------------|
+| id       | BIGINT | No       | 主键(雪花算法生成) |
+| account  | String | No       | 登录账号       |
+| userName | String | No       | 职员名称       |
+| email    | String | No       | 职员邮箱       |
+| phone    | String | No       | 职员联系电话     |
+| orgId    | BIGINT | No       | 所属机构ID     |
+| roleList    | List   | No       | 角色集合       |
 
 ##  职员创建
 
@@ -817,29 +828,37 @@
       "userName": "xxx",
       "email":"xxx",
       "phone":"xxx",
-      "orgId":"xxx"
+      "orgId":"xxx",
+      "roleList":[73220290639036416,73212978522226688]
 }
 ```
 
 入参描述
 
-| 变量名   | 变量类型 | 可为NULL | 描述         |
-| -------- | -------- | -------- | ------------ |
-| account  | String   | No       | 登录账号     |
-| password | String   | No       | 加密后的密码 |
-| userName | String   | No       | 职员名称     |
-| email    | String   | No       | 职员邮箱     |
-| phone    | String   | No       | 职员联系电话 |
-| orgId    | BIGINT   | No       | 所属机构ID   |
+| 变量名   | 变量类型   | 可为NULL | 描述     |
+| -------- |--------| -------- |--------|
+| account  | String | No       | 登录账号   |
+| password | String | No       | 加密后的密码 |
+| userName | String | No       | 职员名称   |
+| email    | String | No       | 职员邮箱   |
+| phone    | String | No       | 职员联系电话 |
+| orgId    | BIGINT | No       | 所属机构ID |
+| roleList    | List   | No       | 角色id集合 |
 
 调用成功返回示例
 
 ```json
 {
-"code":"200",
-"msg":"创建成功",
-"data":"null",
-"success": true
+  "code": 200,
+  "success": true,
+  "data": {
+    "account": "test1",
+    "roleList": [
+      73220290639036416,
+      73212978522226688
+    ]
+  },
+  "msg": "操作成功"
 }
 ```
 
@@ -857,11 +876,11 @@
 {
       "id":"xxx",
       "account": "xxx",
-      "password": "xxx",
       "userName": "xxx",
       "email":"xxx",
       "phone":"xxx",
-      "orgId":"xxx"
+      "orgId":"xxx",
+  "roleList":[73220290639036416,73212978522226688]
 }
 ```
 
@@ -871,20 +890,19 @@
 | -------- | -------- | -------- | ------------------ |
 | id       | BIGINT   | No       | 主键(雪花算法生成) |
 | account  | String   | No       | 登录账号           |
-| password | String   | No       | 加密后的密码       |
 | userName | String   | No       | 职员名称           |
 | email    | String   | No       | 职员邮箱           |
 | phone    | String   | No       | 职员联系电话       |
 | orgId    | BIGINT   | No       | 所属机构ID         |
+| roleList    | List   | No       | 角色id集合 |
 
 调用成功返回示例
 
 ```json
 {
-"code":"200",
-"msg":"修改成功",
-"data":"null",
-"success": true
+  "code": 200,
+  "success": true,
+  "msg": "操作成功"
 }
 ```
 
@@ -912,10 +930,9 @@
 
 ```json
 {
-"code":"200",
-"msg":"修改成功",
-"data":"null",
-"success": true
+  "code": 200,
+  "success": true,
+  "msg": "操作成功"
 }
 ```