@reglow/reglow 0.4.5 → 0.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +51 -0
- package/dist/reglow/common/sort.d.ts +66 -0
- package/dist/reglow/common/sort.js +102 -0
- package/dist/reglow/common/sort.js.map +1 -0
- package/dist/reglow/core/config.js +1 -1
- package/dist/reglow/modules/agreement/controller.js +47 -14
- package/dist/reglow/modules/agreement/controller.js.map +1 -1
- package/dist/reglow/modules/agreement/repository.d.ts +6 -2
- package/dist/reglow/modules/agreement/repository.js +50 -10
- package/dist/reglow/modules/agreement/repository.js.map +1 -1
- package/dist/reglow/modules/agreement/service.d.ts +2 -2
- package/dist/reglow/modules/agreement/service.js +4 -4
- package/dist/reglow/modules/agreement/service.js.map +1 -1
- package/dist/reglow/modules/article/controller.js +46 -13
- package/dist/reglow/modules/article/controller.js.map +1 -1
- package/dist/reglow/modules/article/repository.d.ts +6 -2
- package/dist/reglow/modules/article/repository.js +48 -10
- package/dist/reglow/modules/article/repository.js.map +1 -1
- package/dist/reglow/modules/article/service.d.ts +2 -2
- package/dist/reglow/modules/article/service.js +10 -8
- package/dist/reglow/modules/article/service.js.map +1 -1
- package/dist/reglow/modules/config/controller.js +1 -1
- package/dist/reglow/modules/config/controller.js.map +1 -1
- package/dist/reglow/modules/config/repository.d.ts +3 -1
- package/dist/reglow/modules/config/repository.js +18 -4
- package/dist/reglow/modules/config/repository.js.map +1 -1
- package/dist/reglow/modules/customer_service/controller.js +77 -23
- package/dist/reglow/modules/customer_service/controller.js.map +1 -1
- package/dist/reglow/modules/customer_service/repository.d.ts +15 -5
- package/dist/reglow/modules/customer_service/repository.js +93 -15
- package/dist/reglow/modules/customer_service/repository.js.map +1 -1
- package/dist/reglow/modules/customer_service/service.d.ts +5 -5
- package/dist/reglow/modules/customer_service/service.js +10 -10
- package/dist/reglow/modules/customer_service/service.js.map +1 -1
- package/dist/reglow/modules/dept/controller.js +1 -1
- package/dist/reglow/modules/dept/controller.js.map +1 -1
- package/dist/reglow/modules/dept/repository.d.ts +3 -1
- package/dist/reglow/modules/dept/repository.js +42 -5
- package/dist/reglow/modules/dept/repository.js.map +1 -1
- package/dist/reglow/modules/dept/service.d.ts +1 -1
- package/dist/reglow/modules/dept/service.js +2 -2
- package/dist/reglow/modules/dept/service.js.map +1 -1
- package/dist/reglow/modules/dict/controller.js +18 -6
- package/dist/reglow/modules/dict/controller.js.map +1 -1
- package/dist/reglow/modules/dict/repository.d.ts +6 -2
- package/dist/reglow/modules/dict/repository.js +28 -7
- package/dist/reglow/modules/dict/repository.js.map +1 -1
- package/dist/reglow/modules/dict/service.d.ts +2 -2
- package/dist/reglow/modules/dict/service.js +4 -4
- package/dist/reglow/modules/dict/service.js.map +1 -1
- package/dist/reglow/modules/employee/controller.js +1 -1
- package/dist/reglow/modules/employee/controller.js.map +1 -1
- package/dist/reglow/modules/employee/repository.d.ts +3 -1
- package/dist/reglow/modules/employee/repository.js +35 -4
- package/dist/reglow/modules/employee/repository.js.map +1 -1
- package/dist/reglow/modules/employee/service.d.ts +1 -1
- package/dist/reglow/modules/employee/service.js +2 -2
- package/dist/reglow/modules/employee/service.js.map +1 -1
- package/dist/reglow/modules/log/controller.js +46 -7
- package/dist/reglow/modules/log/controller.js.map +1 -1
- package/dist/reglow/modules/material/controller.js +26 -8
- package/dist/reglow/modules/material/controller.js.map +1 -1
- package/dist/reglow/modules/material/repository.d.ts +4 -2
- package/dist/reglow/modules/material/repository.js +24 -7
- package/dist/reglow/modules/material/repository.js.map +1 -1
- package/dist/reglow/modules/material/service.d.ts +2 -2
- package/dist/reglow/modules/material/service.js +11 -7
- package/dist/reglow/modules/material/service.js.map +1 -1
- package/dist/reglow/modules/message/controller.js +32 -13
- package/dist/reglow/modules/message/controller.js.map +1 -1
- package/dist/reglow/modules/message/repository.d.ts +7 -3
- package/dist/reglow/modules/message/repository.js +63 -19
- package/dist/reglow/modules/message/repository.js.map +1 -1
- package/dist/reglow/modules/message/service.d.ts +3 -3
- package/dist/reglow/modules/message/service.js +18 -8
- package/dist/reglow/modules/message/service.js.map +1 -1
- package/dist/reglow/modules/notice/controller.js +22 -7
- package/dist/reglow/modules/notice/controller.js.map +1 -1
- package/dist/reglow/modules/notice/repository.d.ts +4 -2
- package/dist/reglow/modules/notice/repository.js +24 -9
- package/dist/reglow/modules/notice/repository.js.map +1 -1
- package/dist/reglow/modules/notice/service.d.ts +2 -2
- package/dist/reglow/modules/notice/service.js +16 -7
- package/dist/reglow/modules/notice/service.js.map +1 -1
- package/dist/reglow/modules/photo/controller.js +46 -13
- package/dist/reglow/modules/photo/controller.js.map +1 -1
- package/dist/reglow/modules/photo/repository.d.ts +6 -2
- package/dist/reglow/modules/photo/repository.js +53 -8
- package/dist/reglow/modules/photo/repository.js.map +1 -1
- package/dist/reglow/modules/photo/service.d.ts +2 -2
- package/dist/reglow/modules/photo/service.js +23 -11
- package/dist/reglow/modules/photo/service.js.map +1 -1
- package/dist/reglow/modules/post/controller.js +1 -1
- package/dist/reglow/modules/post/controller.js.map +1 -1
- package/dist/reglow/modules/post/repository.d.ts +3 -1
- package/dist/reglow/modules/post/repository.js +26 -6
- package/dist/reglow/modules/post/repository.js.map +1 -1
- package/dist/reglow/modules/post/service.d.ts +1 -1
- package/dist/reglow/modules/post/service.js +2 -2
- package/dist/reglow/modules/post/service.js.map +1 -1
- package/dist/reglow/modules/role/controller.js +1 -1
- package/dist/reglow/modules/role/controller.js.map +1 -1
- package/dist/reglow/modules/role/repository.d.ts +3 -1
- package/dist/reglow/modules/role/repository.js +38 -9
- package/dist/reglow/modules/role/repository.js.map +1 -1
- package/dist/reglow/modules/role/service.d.ts +1 -1
- package/dist/reglow/modules/role/service.js +2 -2
- package/dist/reglow/modules/role/service.js.map +1 -1
- package/dist/reglow/modules/user/controller.js +1 -1
- package/dist/reglow/modules/user/controller.js.map +1 -1
- package/dist/reglow/modules/user/repository.d.ts +3 -1
- package/dist/reglow/modules/user/repository.js +30 -3
- package/dist/reglow/modules/user/repository.js.map +1 -1
- package/dist/reglow/modules/user/service.d.ts +1 -1
- package/dist/reglow/modules/user/service.js +2 -2
- package/dist/reglow/modules/user/service.js.map +1 -1
- package/dist/reglow/modules/video/controller.js +54 -15
- package/dist/reglow/modules/video/controller.js.map +1 -1
- package/dist/reglow/modules/video/repository.d.ts +6 -2
- package/dist/reglow/modules/video/repository.js +41 -8
- package/dist/reglow/modules/video/repository.js.map +1 -1
- package/dist/reglow/modules/video/service.d.ts +2 -2
- package/dist/reglow/modules/video/service.js +16 -10
- package/dist/reglow/modules/video/service.js.map +1 -1
- package/package.json +3 -2
package/README.md
CHANGED
|
@@ -194,6 +194,50 @@ reglow/
|
|
|
194
194
|
}
|
|
195
195
|
```
|
|
196
196
|
|
|
197
|
+
### 分页排序(`sort_by` / `sort_order`)
|
|
198
|
+
|
|
199
|
+
所有**管理端分页列表接口**统一支持服务端**多列**排序,通过以下两个可选查询参数控制:
|
|
200
|
+
|
|
201
|
+
| 参数 | 类型 | 默认值 | 取值约束 |
|
|
202
|
+
| ------------ | ------ | ------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
203
|
+
| `sort_by` | string | 无 | 排序字段列表,逗号分隔,**最多 3 项**(超出 3 项的尾部直接忽略)。每项为 `field` 或 `field:dir`(`dir` = `asc` \| `desc`,大小写不敏感,`:dir` 可省略)。字段取该列表项 item DTO 的 **snake_case** 字段名(即数据库列名风格),精确匹配、大小写敏感;仅接受该表**自有**列(不含关联/join 列),且排除敏感列 |
|
|
204
|
+
| `sort_order` | string | `asc` | `asc` \| `desc`,大小写不敏感;作为**未显式带 `:dir` 的项**的默认方向 |
|
|
205
|
+
|
|
206
|
+
生效规则:
|
|
207
|
+
|
|
208
|
+
- **逐项校验**:每一项字段都必须命中该表的可排序列白名单(实体自有列、且排除敏感列);非法 / 敏感 / 未知字段只**跳过该项**,其余合法项照常生效,**不报错、不返回 400/500**;
|
|
209
|
+
- 一个合法项都没有(`sort_by` 缺省 / 空串 / 全部非法或敏感)→ **完全忽略**排序参数,接口保持原有默认排序,SQL 与响应与不带该参数时完全一致,**不报错、不返回 400**;
|
|
210
|
+
- 排序生效时:按合法项的**书写顺序**依次作为**主 → 次 → 末**排序,末尾再追加该接口**原有默认排序链**兜底,保证分页稳定、结果确定;
|
|
211
|
+
- 旧单列写法 `?sort_by=created_at&sort_order=desc` 继续有效(等价于单列,行为、SQL、响应与之前完全一致);
|
|
212
|
+
- 可排序列白名单在各自模块的 repository 中显式声明(如 `USER_SORTABLE_COLUMNS`),用户输入的每一项都先经白名单解析为真实列名常量再交给 knex,永不直接拼入 `ORDER BY`。
|
|
213
|
+
|
|
214
|
+
敏感列(即使存在也禁止排序):`password`、`password_hash`、`salt`、`token`、`refresh_token`、`access_token`、`secret`、`app_secret`、`api_key`、`private_key`。
|
|
215
|
+
|
|
216
|
+
示例:
|
|
217
|
+
|
|
218
|
+
```http
|
|
219
|
+
# 多列:昵称升序为主、创建时间降序为次,末尾追加接口原有默认排序(id desc)兜底
|
|
220
|
+
GET /admin/api/v1/users/?page=1&size=20&sort_by=nickname:asc,created_at:desc
|
|
221
|
+
|
|
222
|
+
# 混合省略方向:两项均未带 :dir,统一使用 sort_order(此处 asc)
|
|
223
|
+
GET /admin/api/v1/users/?page=1&size=20&sort_by=nickname,created_at&sort_order=asc
|
|
224
|
+
|
|
225
|
+
# 旧单列写法:行为、SQL、响应与不带 :dir 的单列完全一致
|
|
226
|
+
GET /admin/api/v1/users/?sort_by=created_at&sort_order=desc
|
|
227
|
+
|
|
228
|
+
# 含敏感列:仅跳过 password_hash,仍按 nickname 降序
|
|
229
|
+
GET /admin/api/v1/users/?sort_by=password_hash,nickname:desc
|
|
230
|
+
|
|
231
|
+
# 方向大小写不敏感
|
|
232
|
+
GET /admin/api/v1/dict-types/?page=1&size=10&sort_by=name:DESC
|
|
233
|
+
|
|
234
|
+
# 超过 3 项:只取前 3 项,尾部忽略
|
|
235
|
+
GET /admin/api/v1/users/?sort_by=status:asc,nickname:desc,created_at:asc,id:asc
|
|
236
|
+
|
|
237
|
+
# 全部非法:忽略排序,回落接口原有默认排序,不报错
|
|
238
|
+
GET /admin/api/v1/users/?sort_by=password_hash,not_a_column
|
|
239
|
+
```
|
|
240
|
+
|
|
197
241
|
### 异常码体系
|
|
198
242
|
|
|
199
243
|
按模块分段的统一异常码,覆盖 `1000-9999` 范围,详见 `reglow/common/errors.ts`。
|
|
@@ -258,10 +302,17 @@ npm run dev
|
|
|
258
302
|
# 类型检查
|
|
259
303
|
npm run type-check
|
|
260
304
|
|
|
305
|
+
# 单元/契约测试(排序契约)
|
|
306
|
+
npm test
|
|
307
|
+
|
|
261
308
|
# 编译
|
|
262
309
|
npm run build
|
|
263
310
|
```
|
|
264
311
|
|
|
312
|
+
> 说明:`npm test` 使用临时 SQLite 数据库运行排序契约测试(`tests/sort.test.ts`)。
|
|
313
|
+
> 由于 `better-sqlite3` 为原生模块,请使用与其编译时的 ABI 相匹配的 Node 版本
|
|
314
|
+
> (本仓库预编译版本对应 Node 20;若 Node 版本不一致,可执行 `npm rebuild better-sqlite3`)。
|
|
315
|
+
|
|
265
316
|
## License
|
|
266
317
|
|
|
267
318
|
UNLICENSED
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 管理端分页列表统一服务端排序工具(支持多列)。
|
|
3
|
+
*
|
|
4
|
+
* 统一契约(四端一致):
|
|
5
|
+
* - `sort_by`:排序字段列表,逗号分隔,**最多 3 项**(超出部分直接忽略);
|
|
6
|
+
* 每项为 `field` 或 `field:dir`(`dir` = `asc` | `desc`,大小写不敏感,`:dir` 可省略)。
|
|
7
|
+
* 字段名取列表项 item DTO 的 snake_case 字段名(即数据库列名风格),精确匹配、大小写敏感;
|
|
8
|
+
* 仅接受该实体(表)**自有**的列,不含关联/join 列或计算字段。
|
|
9
|
+
* 例:`?sort_by=nickname:asc,created_at:desc`
|
|
10
|
+
* - `sort_order`:`asc` | `desc`,大小写不敏感,默认 `asc`;作为「未显式带 `:dir` 的项」的默认方向。
|
|
11
|
+
* 旧写法 `?sort_by=created_at&sort_order=desc` 继续有效(等价于单列多列契约的第一项)。
|
|
12
|
+
* - **逐项校验**:字段必须命中 `allowed`(该表可排序列白名单)且非敏感列;
|
|
13
|
+
* 非法 / 敏感 / 未知字段:**跳过该项**,保留其余合法项(**不报错、不返回 400/500**);
|
|
14
|
+
* 一个合法项都没有 → **完全忽略**排序参数,保持调用方原有默认排序,不报错、不返回 400。
|
|
15
|
+
* - 生效时:按合法项的**书写顺序**依次作为主→次→末排序,最后追加该接口**原有默认排序链**
|
|
16
|
+
* (`defaultOrder`),保证分页稳定、结果确定。
|
|
17
|
+
* - 用户输入永不直接拼入 ORDER BY:每一项都必须先经 `allowed` 白名单解析为真实列名常量,
|
|
18
|
+
* 再交给 knex 的 `.orderBy(column, direction)`。
|
|
19
|
+
*
|
|
20
|
+
* 对应 backend-python 的 reglow/common/sort.py、backend-rust 的 src/common/sort.rs。
|
|
21
|
+
*/
|
|
22
|
+
import type { Knex } from "knex";
|
|
23
|
+
/** 最多允许的排序项数(`sort_by` 中超出 3 项的尾部直接忽略) */
|
|
24
|
+
export declare const MAX_SORT_ITEMS = 3;
|
|
25
|
+
/** 敏感列名单 —— 无论实体是否拥有该列,都不允许作为排序字段 */
|
|
26
|
+
export declare const SORTABLE_EXCLUDED: ReadonlySet<string>;
|
|
27
|
+
/** 是否为敏感列(不可作为排序字段) */
|
|
28
|
+
export declare function isSensitiveColumn(name: string): boolean;
|
|
29
|
+
/** 解析排序方向:`desc`(大小写不敏感),其它一律按 `asc` 处理 */
|
|
30
|
+
export declare function parseSortOrder(v?: string | null): "asc" | "desc";
|
|
31
|
+
/**
|
|
32
|
+
* 解析 `sort_by` 为排序项列表(仅做语法解析,**不做白名单/敏感列校验**)。
|
|
33
|
+
*
|
|
34
|
+
* - 逗号分隔,每项 `field` 或 `field:dir`;`dir` 大小写不敏感;
|
|
35
|
+
* - 未显式带 `:dir` 的项使用 `sortOrder`(默认 `asc`)作为方向;
|
|
36
|
+
* - 空项 / 空字段被忽略;最多返回 `MAX_SORT_ITEMS` 项(超出尾部忽略)。
|
|
37
|
+
*
|
|
38
|
+
* 白名单与敏感列校验由调用方(`applySort`)逐项进行。
|
|
39
|
+
*/
|
|
40
|
+
export declare function parseSortItems(sortBy: string | undefined | null, sortOrder: string | undefined | null): Array<{
|
|
41
|
+
field: string;
|
|
42
|
+
order: "asc" | "desc";
|
|
43
|
+
}>;
|
|
44
|
+
/**
|
|
45
|
+
* 校验并解析**单列**排序规格(保留单列语义,供其它调用方使用)。
|
|
46
|
+
*
|
|
47
|
+
* 仅当 `sortBy` 是非空字符串、非敏感列、且落在 `allowed`(该表可排序列白名单)内时,
|
|
48
|
+
* 返回真实列名与方向;否则返回 `null`(调用方据此忽略排序参数,保持默认排序)。
|
|
49
|
+
*/
|
|
50
|
+
export declare function resolveSort(sortBy: string | undefined | null, sortOrder: string | undefined | null, allowed: readonly string[]): {
|
|
51
|
+
column: string;
|
|
52
|
+
order: "asc" | "desc";
|
|
53
|
+
} | null;
|
|
54
|
+
/**
|
|
55
|
+
* 为分页查询应用统一排序,作为各列表接口的唯一入口。
|
|
56
|
+
*
|
|
57
|
+
* - 逐项解析 `sort_by`,对每个合法项(命中 `allowed` 且非敏感列)按书写顺序
|
|
58
|
+
* `.orderBy(<真实列>, <方向>)`,最后追加 `defaultOrder`(分页稳定兜底);
|
|
59
|
+
* - 无任何合法项(缺省 / 空串 / 全部非法或敏感):只追加 `defaultOrder`
|
|
60
|
+
* (生成的 SQL 与不带排序参数时完全一致)。
|
|
61
|
+
*
|
|
62
|
+
* `columnPrefix` 为可选参数:当列表查询存在 join、列名可能产生歧义时(如员工列表、
|
|
63
|
+
* 客服会话列表),传入所属表名以限定列(如 `${Employee}.id`);前缀只加在白名单解析出的
|
|
64
|
+
* 真实列上。不带 join 的查询无需传入。
|
|
65
|
+
*/
|
|
66
|
+
export declare function applySort<T extends Knex.QueryBuilder>(qb: T, sortBy: string | undefined | null, sortOrder: string | undefined | null, allowed: readonly string[], defaultOrder: ReadonlyArray<[string, "asc" | "desc"]>, columnPrefix?: string): T;
|
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
/** 最多允许的排序项数(`sort_by` 中超出 3 项的尾部直接忽略) */
|
|
2
|
+
export const MAX_SORT_ITEMS = 3;
|
|
3
|
+
/** 敏感列名单 —— 无论实体是否拥有该列,都不允许作为排序字段 */
|
|
4
|
+
export const SORTABLE_EXCLUDED = new Set([
|
|
5
|
+
"password",
|
|
6
|
+
"password_hash",
|
|
7
|
+
"salt",
|
|
8
|
+
"token",
|
|
9
|
+
"refresh_token",
|
|
10
|
+
"access_token",
|
|
11
|
+
"secret",
|
|
12
|
+
"app_secret",
|
|
13
|
+
"api_key",
|
|
14
|
+
"private_key",
|
|
15
|
+
]);
|
|
16
|
+
/** 是否为敏感列(不可作为排序字段) */
|
|
17
|
+
export function isSensitiveColumn(name) {
|
|
18
|
+
if (typeof name !== "string")
|
|
19
|
+
return false;
|
|
20
|
+
return SORTABLE_EXCLUDED.has(name.trim().toLowerCase());
|
|
21
|
+
}
|
|
22
|
+
/** 解析排序方向:`desc`(大小写不敏感),其它一律按 `asc` 处理 */
|
|
23
|
+
export function parseSortOrder(v) {
|
|
24
|
+
if (typeof v === "string" && v.trim().toLowerCase() === "desc")
|
|
25
|
+
return "desc";
|
|
26
|
+
return "asc";
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* 解析 `sort_by` 为排序项列表(仅做语法解析,**不做白名单/敏感列校验**)。
|
|
30
|
+
*
|
|
31
|
+
* - 逗号分隔,每项 `field` 或 `field:dir`;`dir` 大小写不敏感;
|
|
32
|
+
* - 未显式带 `:dir` 的项使用 `sortOrder`(默认 `asc`)作为方向;
|
|
33
|
+
* - 空项 / 空字段被忽略;最多返回 `MAX_SORT_ITEMS` 项(超出尾部忽略)。
|
|
34
|
+
*
|
|
35
|
+
* 白名单与敏感列校验由调用方(`applySort`)逐项进行。
|
|
36
|
+
*/
|
|
37
|
+
export function parseSortItems(sortBy, sortOrder) {
|
|
38
|
+
if (typeof sortBy !== "string")
|
|
39
|
+
return [];
|
|
40
|
+
const items = [];
|
|
41
|
+
for (const raw of sortBy.split(",")) {
|
|
42
|
+
const item = raw.trim();
|
|
43
|
+
if (!item)
|
|
44
|
+
continue;
|
|
45
|
+
const sep = item.indexOf(":");
|
|
46
|
+
const field = (sep >= 0 ? item.slice(0, sep) : item).trim();
|
|
47
|
+
if (!field)
|
|
48
|
+
continue;
|
|
49
|
+
const explicitDir = sep >= 0 ? item.slice(sep + 1).trim() : "";
|
|
50
|
+
const order = explicitDir
|
|
51
|
+
? parseSortOrder(explicitDir)
|
|
52
|
+
: parseSortOrder(sortOrder);
|
|
53
|
+
items.push({ field, order });
|
|
54
|
+
if (items.length >= MAX_SORT_ITEMS)
|
|
55
|
+
break;
|
|
56
|
+
}
|
|
57
|
+
return items;
|
|
58
|
+
}
|
|
59
|
+
/**
|
|
60
|
+
* 校验并解析**单列**排序规格(保留单列语义,供其它调用方使用)。
|
|
61
|
+
*
|
|
62
|
+
* 仅当 `sortBy` 是非空字符串、非敏感列、且落在 `allowed`(该表可排序列白名单)内时,
|
|
63
|
+
* 返回真实列名与方向;否则返回 `null`(调用方据此忽略排序参数,保持默认排序)。
|
|
64
|
+
*/
|
|
65
|
+
export function resolveSort(sortBy, sortOrder, allowed) {
|
|
66
|
+
if (typeof sortBy !== "string")
|
|
67
|
+
return null;
|
|
68
|
+
const name = sortBy.trim();
|
|
69
|
+
if (!name || isSensitiveColumn(name))
|
|
70
|
+
return null;
|
|
71
|
+
if (!allowed.includes(name))
|
|
72
|
+
return null;
|
|
73
|
+
return { column: name, order: parseSortOrder(sortOrder) };
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
* 为分页查询应用统一排序,作为各列表接口的唯一入口。
|
|
77
|
+
*
|
|
78
|
+
* - 逐项解析 `sort_by`,对每个合法项(命中 `allowed` 且非敏感列)按书写顺序
|
|
79
|
+
* `.orderBy(<真实列>, <方向>)`,最后追加 `defaultOrder`(分页稳定兜底);
|
|
80
|
+
* - 无任何合法项(缺省 / 空串 / 全部非法或敏感):只追加 `defaultOrder`
|
|
81
|
+
* (生成的 SQL 与不带排序参数时完全一致)。
|
|
82
|
+
*
|
|
83
|
+
* `columnPrefix` 为可选参数:当列表查询存在 join、列名可能产生歧义时(如员工列表、
|
|
84
|
+
* 客服会话列表),传入所属表名以限定列(如 `${Employee}.id`);前缀只加在白名单解析出的
|
|
85
|
+
* 真实列上。不带 join 的查询无需传入。
|
|
86
|
+
*/
|
|
87
|
+
export function applySort(qb, sortBy, sortOrder, allowed, defaultOrder, columnPrefix) {
|
|
88
|
+
let query = qb;
|
|
89
|
+
for (const { field, order } of parseSortItems(sortBy, sortOrder)) {
|
|
90
|
+
if (isSensitiveColumn(field))
|
|
91
|
+
continue;
|
|
92
|
+
if (!allowed.includes(field))
|
|
93
|
+
continue;
|
|
94
|
+
const column = columnPrefix ? `${columnPrefix}.${field}` : field;
|
|
95
|
+
query = query.orderBy(column, order);
|
|
96
|
+
}
|
|
97
|
+
for (const [column, order] of defaultOrder) {
|
|
98
|
+
query = query.orderBy(column, order);
|
|
99
|
+
}
|
|
100
|
+
return query;
|
|
101
|
+
}
|
|
102
|
+
//# sourceMappingURL=sort.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sort.js","sourceRoot":"","sources":["../../../reglow/common/sort.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,7 @@ const JWT_SECRET = str(env.JWT_SECRET, "change-me-in-production");
|
|
|
31
31
|
const settings = {
|
|
32
32
|
// Application
|
|
33
33
|
APP_NAME: str(env.APP_NAME, "ReglowAdmin"),
|
|
34
|
-
APP_VERSION: str(env.APP_VERSION, "0.
|
|
34
|
+
APP_VERSION: str(env.APP_VERSION, "0.5.0"),
|
|
35
35
|
DEBUG: bool(env.DEBUG, false),
|
|
36
36
|
PORT: int(env.PORT, 9520),
|
|
37
37
|
// Database
|
|
@@ -66,14 +66,17 @@ function toHistoryListItemDto(h, userCount = 0) {
|
|
|
66
66
|
export async function agreementRoutes(fastify, _opts) {
|
|
67
67
|
const service = new AgreementService();
|
|
68
68
|
// 协议列表
|
|
69
|
-
fastify.get("/", {
|
|
69
|
+
fastify.get("/", {
|
|
70
|
+
schema: { summary: "协议列表" },
|
|
71
|
+
preHandler: [fastify.requirePermission("system:agreement:list")],
|
|
72
|
+
}, async (request) => {
|
|
70
73
|
const query = request.query;
|
|
71
74
|
const page = Math.max(1, int(query.page, 1));
|
|
72
75
|
const size = Math.min(100, Math.max(1, int(query.size, 20)));
|
|
73
76
|
const keyword = query.keyword || null;
|
|
74
77
|
const type = query.type || null;
|
|
75
78
|
const status = intOrNull(query.status);
|
|
76
|
-
const { items, total } = await service.listAgreements(page, size, keyword, type, status);
|
|
79
|
+
const { items, total } = await service.listAgreements(page, size, keyword, type, status, query.sort_by || null, query.sort_order || null);
|
|
77
80
|
const resultItems = [];
|
|
78
81
|
for (const item of items) {
|
|
79
82
|
const pv = item.published_version || item.version || "0.0.0";
|
|
@@ -91,13 +94,16 @@ export async function agreementRoutes(fastify, _opts) {
|
|
|
91
94
|
return ApiResponse.success(toAgreementDto(obj), "创建成功(草稿)");
|
|
92
95
|
});
|
|
93
96
|
// 历史记录(全部发布记录)
|
|
94
|
-
fastify.get("/history/list", {
|
|
97
|
+
fastify.get("/history/list", {
|
|
98
|
+
schema: { summary: "历史记录(全部发布记录)" },
|
|
99
|
+
preHandler: [fastify.requirePermission("system:agreement:list")],
|
|
100
|
+
}, async (request) => {
|
|
95
101
|
const query = request.query;
|
|
96
102
|
const page = Math.max(1, int(query.page, 1));
|
|
97
103
|
const size = Math.min(100, Math.max(1, int(query.size, 20)));
|
|
98
104
|
const keyword = query.keyword || null;
|
|
99
105
|
const type = query.type || null;
|
|
100
|
-
const { items, total } = await service.listHistory(page, size, keyword, type, false);
|
|
106
|
+
const { items, total } = await service.listHistory(page, size, keyword, type, false, query.sort_by || null, query.sort_order || null);
|
|
101
107
|
const resultItems = [];
|
|
102
108
|
for (const item of items) {
|
|
103
109
|
const userCount = await service.repo.countUserAgreement(item.code, item.version);
|
|
@@ -106,12 +112,15 @@ export async function agreementRoutes(fastify, _opts) {
|
|
|
106
112
|
return ApiResponse.success(new PageData(resultItems, total, page, size));
|
|
107
113
|
});
|
|
108
114
|
// 历史协议归档(旧版本)
|
|
109
|
-
fastify.get("/history/archive", {
|
|
115
|
+
fastify.get("/history/archive", {
|
|
116
|
+
schema: { summary: "历史协议归档(旧版本)" },
|
|
117
|
+
preHandler: [fastify.requirePermission("system:agreement:list")],
|
|
118
|
+
}, async (request) => {
|
|
110
119
|
const query = request.query;
|
|
111
120
|
const page = Math.max(1, int(query.page, 1));
|
|
112
121
|
const size = Math.min(100, Math.max(1, int(query.size, 20)));
|
|
113
122
|
const keyword = query.keyword || null;
|
|
114
|
-
const { items, total } = await service.listHistory(page, size, keyword, null, true);
|
|
123
|
+
const { items, total } = await service.listHistory(page, size, keyword, null, true, query.sort_by || null, query.sort_order || null);
|
|
115
124
|
const resultItems = [];
|
|
116
125
|
for (const item of items) {
|
|
117
126
|
const userCount = await service.repo.countUserAgreement(item.code, item.version);
|
|
@@ -120,7 +129,10 @@ export async function agreementRoutes(fastify, _opts) {
|
|
|
120
129
|
return ApiResponse.success(new PageData(resultItems, total, page, size));
|
|
121
130
|
});
|
|
122
131
|
// 历史协议详情
|
|
123
|
-
fastify.get("/history/:history_id", {
|
|
132
|
+
fastify.get("/history/:history_id", {
|
|
133
|
+
schema: { summary: "历史协议详情" },
|
|
134
|
+
preHandler: [fastify.requirePermission("system:agreement:list")],
|
|
135
|
+
}, async (request) => {
|
|
124
136
|
const id = int(request.params.history_id, 0);
|
|
125
137
|
const { item, userIds } = await service.getHistoryDetail(id);
|
|
126
138
|
const userCount = userIds.length;
|
|
@@ -138,25 +150,37 @@ export async function agreementRoutes(fastify, _opts) {
|
|
|
138
150
|
}, ["created_at", "updated_at"]));
|
|
139
151
|
});
|
|
140
152
|
// 提醒历史版本用户
|
|
141
|
-
fastify.post("/history/:history_id/notify", {
|
|
153
|
+
fastify.post("/history/:history_id/notify", {
|
|
154
|
+
schema: { summary: "提醒历史版本用户" },
|
|
155
|
+
preHandler: [fastify.requirePermission("system:agreement:update")],
|
|
156
|
+
}, async (request) => {
|
|
142
157
|
const id = int(request.params.history_id, 0);
|
|
143
158
|
const count = await service.notifyHistoryUsers(id);
|
|
144
159
|
return ApiResponse.success(null, `已向 ${count} 位用户发送协议更新提醒`);
|
|
145
160
|
});
|
|
146
161
|
// 删除历史协议
|
|
147
|
-
fastify.delete("/history/:history_id", {
|
|
162
|
+
fastify.delete("/history/:history_id", {
|
|
163
|
+
schema: { summary: "删除历史协议" },
|
|
164
|
+
preHandler: [fastify.requirePermission("system:agreement:delete")],
|
|
165
|
+
}, async (request) => {
|
|
148
166
|
const id = int(request.params.history_id, 0);
|
|
149
167
|
await service.deleteHistory(id);
|
|
150
168
|
return ApiResponse.success(null, "删除成功");
|
|
151
169
|
});
|
|
152
170
|
// 作废历史协议
|
|
153
|
-
fastify.post("/history/:history_id/void", {
|
|
171
|
+
fastify.post("/history/:history_id/void", {
|
|
172
|
+
schema: { summary: "作废历史协议" },
|
|
173
|
+
preHandler: [fastify.requirePermission("system:agreement:update")],
|
|
174
|
+
}, async (request) => {
|
|
154
175
|
const id = int(request.params.history_id, 0);
|
|
155
176
|
await service.voidHistory(id);
|
|
156
177
|
return ApiResponse.success(null, "已作废");
|
|
157
178
|
});
|
|
158
179
|
// 协议详情
|
|
159
|
-
fastify.get("/:agreement_id", {
|
|
180
|
+
fastify.get("/:agreement_id", {
|
|
181
|
+
schema: { summary: "协议详情" },
|
|
182
|
+
preHandler: [fastify.requirePermission("system:agreement:list")],
|
|
183
|
+
}, async (request) => {
|
|
160
184
|
const id = int(request.params.agreement_id, 0);
|
|
161
185
|
return ApiResponse.success(toAgreementDto(await service.getAgreement(id)));
|
|
162
186
|
});
|
|
@@ -170,7 +194,10 @@ export async function agreementRoutes(fastify, _opts) {
|
|
|
170
194
|
return ApiResponse.success(toAgreementDto(obj), "保存成功(草稿)");
|
|
171
195
|
});
|
|
172
196
|
// 删除协议
|
|
173
|
-
fastify.delete("/:agreement_id", {
|
|
197
|
+
fastify.delete("/:agreement_id", {
|
|
198
|
+
schema: { summary: "删除协议" },
|
|
199
|
+
preHandler: [fastify.requirePermission("system:agreement:delete")],
|
|
200
|
+
}, async (request) => {
|
|
174
201
|
const id = int(request.params.agreement_id, 0);
|
|
175
202
|
const msg = await service.deleteAgreement(id);
|
|
176
203
|
return ApiResponse.success(null, msg);
|
|
@@ -186,13 +213,19 @@ export async function agreementRoutes(fastify, _opts) {
|
|
|
186
213
|
return ApiResponse.success(toAgreementDto(obj), "发布成功");
|
|
187
214
|
});
|
|
188
215
|
// 撤销草稿
|
|
189
|
-
fastify.post("/:agreement_id/revert", {
|
|
216
|
+
fastify.post("/:agreement_id/revert", {
|
|
217
|
+
schema: { summary: "撤销草稿" },
|
|
218
|
+
preHandler: [fastify.requirePermission("system:agreement:update")],
|
|
219
|
+
}, async (request) => {
|
|
190
220
|
const id = int(request.params.agreement_id, 0);
|
|
191
221
|
const msg = await service.revertAgreement(id);
|
|
192
222
|
return ApiResponse.success(null, msg);
|
|
193
223
|
});
|
|
194
224
|
// 作废协议
|
|
195
|
-
fastify.post("/:agreement_id/void", {
|
|
225
|
+
fastify.post("/:agreement_id/void", {
|
|
226
|
+
schema: { summary: "作废协议" },
|
|
227
|
+
preHandler: [fastify.requirePermission("system:agreement:update")],
|
|
228
|
+
}, async (request) => {
|
|
196
229
|
const id = int(request.params.agreement_id, 0);
|
|
197
230
|
const msg = await service.voidAgreement(id);
|
|
198
231
|
return ApiResponse.success(null, msg);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../../reglow/modules/agreement/controller.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../../reglow/modules/agreement/controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,EACL,qBAAqB,EAErB,qBAAqB,EAErB,sBAAsB,EAEtB,eAAe,GAEhB,MAAM,aAAa,CAAC;AAErB,SAAS,GAAG,CAAC,CAAU,EAAE,GAAW;IAClC,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAClC,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,SAAS,CAAC,CAAU;IAC3B,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE;QAAE,OAAO,IAAI,CAAC;IAC3D,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAClC,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,IAAI,CAAC,CAAU;IACtB,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,MAAM,CAAC;AAC5D,CAAC;AAED,SAAS,cAAc,CAAC,CAAY;IAClC,OAAO,YAAY,CACjB;QACE,EAAE,EAAE,CAAC,CAAC,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,OAAO,EAAE,CAAC,CAAC,OAAO,IAAI,IAAI;QAC1B,OAAO,EAAE,CAAC,CAAC,OAAO,IAAI,IAAI;QAC1B,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC;QACrB,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;QACjB,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC;QAClC,YAAY,EAAE,CAAC,CAAC,YAAY,IAAI,IAAI;QACpC,iBAAiB,EAAE,CAAC,CAAC,iBAAiB,IAAI,IAAI;QAC9C,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,IAAI;QAChC,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,IAAI;KACjC,EACD,CAAC,YAAY,EAAE,YAAY,EAAE,cAAc,CAAC,CAC7C,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAC7B,CAAY,EACZ,SAAS,GAAG,CAAC;IAEb,OAAO,YAAY,CACjB;QACE,EAAE,EAAE,CAAC,CAAC,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,OAAO,EAAE,CAAC,CAAC,OAAO,IAAI,IAAI;QAC1B,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC;QACrB,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC;QACjB,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC;QAClC,YAAY,EAAE,CAAC,CAAC,YAAY,IAAI,IAAI;QACpC,iBAAiB,EAAE,CAAC,CAAC,iBAAiB,IAAI,IAAI;QAC9C,UAAU,EAAE,SAAS;QACrB,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,IAAI;QAChC,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,IAAI;KACjC,EACD,CAAC,YAAY,EAAE,YAAY,EAAE,cAAc,CAAC,CAC7C,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAC3B,CAAmB,EACnB,SAAS,GAAG,CAAC;IAEb,OAAO,YAAY,CACjB;QACE,EAAE,EAAE,CAAC,CAAC,EAAE;QACR,YAAY,EAAE,CAAC,CAAC,YAAY,IAAI,CAAC;QACjC,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5B,UAAU,EAAE,SAAS;QACrB,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,IAAI;KACjC,EACD,CAAC,YAAY,EAAE,YAAY,CAAC,CAC7B,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,OAAwB,EACxB,KAA8B;IAE9B,MAAM,OAAO,GAAG,IAAI,gBAAgB,EAAE,CAAC;IAEvC,OAAO;IACP,OAAO,CAAC,GAAG,CACT,GAAG,EACH;QACE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;QAC3B,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,CAAC;KACjE,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAgC,CAAC;QACvD,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7D,MAAM,OAAO,GAAI,KAAK,CAAC,OAAkB,IAAI,IAAI,CAAC;QAClD,MAAM,IAAI,GAAI,KAAK,CAAC,IAAe,IAAI,IAAI,CAAC;QAC5C,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,OAAO,CAAC,cAAc,CACnD,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,MAAM,EACL,KAAK,CAAC,OAAkB,IAAI,IAAI,EAChC,KAAK,CAAC,UAAqB,IAAI,IAAI,CACrC,CAAC;QACF,MAAM,WAAW,GAA8B,EAAE,CAAC;QAClD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,EAAE,GAAG,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC;YAC7D,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACvE,WAAW,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,WAAW,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC3E,CAAC,CACF,CAAC;IAEF,WAAW;IACX,OAAO,CAAC,IAAI,CACV,GAAG,EACH;QACE,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;QAClE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,qBAAqB,EAAE;KAC7D,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,eAAe,CACvC,OAAO,CAAC,IAA2B,CACpC,CAAC;QACF,OAAO,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;IAC9D,CAAC,CACF,CAAC;IAEF,eAAe;IACf,OAAO,CAAC,GAAG,CACT,eAAe,EACf;QACE,MAAM,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE;QACnC,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,CAAC;KACjE,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAgC,CAAC;QACvD,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7D,MAAM,OAAO,GAAI,KAAK,CAAC,OAAkB,IAAI,IAAI,CAAC;QAClD,MAAM,IAAI,GAAI,KAAK,CAAC,IAAe,IAAI,IAAI,CAAC;QAC5C,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,OAAO,CAAC,WAAW,CAChD,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,KAAK,EACJ,KAAK,CAAC,OAAkB,IAAI,IAAI,EAChC,KAAK,CAAC,UAAqB,IAAI,IAAI,CACrC,CAAC;QACF,MAAM,WAAW,GAA8B,EAAE,CAAC;QAClD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,kBAAkB,CACrD,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,OAAO,CACb,CAAC;YACF,WAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;QAC1D,CAAC;QACD,OAAO,WAAW,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC3E,CAAC,CACF,CAAC;IAEF,cAAc;IACd,OAAO,CAAC,GAAG,CACT,kBAAkB,EAClB;QACE,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE;QAClC,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,CAAC;KACjE,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAgC,CAAC;QACvD,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7D,MAAM,OAAO,GAAI,KAAK,CAAC,OAAkB,IAAI,IAAI,CAAC;QAClD,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,OAAO,CAAC,WAAW,CAChD,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,IAAI,EACH,KAAK,CAAC,OAAkB,IAAI,IAAI,EAChC,KAAK,CAAC,UAAqB,IAAI,IAAI,CACrC,CAAC;QACF,MAAM,WAAW,GAA8B,EAAE,CAAC;QAClD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,kBAAkB,CACrD,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,OAAO,CACb,CAAC;YACF,WAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;QAC1D,CAAC;QACD,OAAO,WAAW,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC3E,CAAC,CACF,CAAC;IAEF,SAAS;IACT,OAAO,CAAC,GAAG,CACT,sBAAsB,EACtB;QACE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC7B,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,CAAC;KACjE,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,GAAG,GAAG,CAAE,OAAO,CAAC,MAAiC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QACzE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAC7D,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;QACjC,OAAO,WAAW,CAAC,OAAO,CACxB,YAAY,CACV;YACE,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;YAC/B,UAAU,EAAE,SAAS;YACrB,QAAQ,EAAE,OAAO;YACjB,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,IAAI;SACpC,EACD,CAAC,YAAY,EAAE,YAAY,CAAC,CAC7B,CACF,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,WAAW;IACX,OAAO,CAAC,IAAI,CACV,6BAA6B,EAC7B;QACE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE;QAC/B,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;KACnE,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,GAAG,GAAG,CAAE,OAAO,CAAC,MAAiC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QACzE,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACnD,OAAO,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,KAAK,cAAc,CAAC,CAAC;IAC9D,CAAC,CACF,CAAC;IAEF,SAAS;IACT,OAAO,CAAC,MAAM,CACZ,sBAAsB,EACtB;QACE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC7B,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;KACnE,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,GAAG,GAAG,CAAE,OAAO,CAAC,MAAiC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QACzE,MAAM,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAChC,OAAO,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3C,CAAC,CACF,CAAC;IAEF,SAAS;IACT,OAAO,CAAC,IAAI,CACV,2BAA2B,EAC3B;QACE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC7B,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;KACnE,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,GAAG,GAAG,CAAE,OAAO,CAAC,MAAiC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QACzE,MAAM,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAC9B,OAAO,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC1C,CAAC,CACF,CAAC;IAEF,OAAO;IACP,OAAO,CAAC,GAAG,CACT,gBAAgB,EAChB;QACE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;QAC3B,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,CAAC;KACjE,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,GAAG,GAAG,CACX,OAAO,CAAC,MAAmC,CAAC,YAAY,EACzD,CAAC,CACF,CAAC;QACF,OAAO,WAAW,CAAC,OAAO,CACxB,cAAc,CAAC,MAAM,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAC/C,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,aAAa;IACb,OAAO,CAAC,GAAG,CACT,gBAAgB,EAChB;QACE,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;QAClE,MAAM,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,qBAAqB,EAAE;KAC/D,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,GAAG,GAAG,CACX,OAAO,CAAC,MAAmC,CAAC,YAAY,EACzD,CAAC,CACF,CAAC;QACF,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,eAAe,CACvC,EAAE,EACF,OAAO,CAAC,IAA2B,CACpC,CAAC;QACF,OAAO,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;IAC9D,CAAC,CACF,CAAC;IAEF,OAAO;IACP,OAAO,CAAC,MAAM,CACZ,gBAAgB,EAChB;QACE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;QAC3B,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;KACnE,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,GAAG,GAAG,CACX,OAAO,CAAC,MAAmC,CAAC,YAAY,EACzD,CAAC,CACF,CAAC;QACF,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QAC9C,OAAO,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACxC,CAAC,CACF,CAAC;IAEF,OAAO;IACP,OAAO,CAAC,IAAI,CACV,wBAAwB,EACxB;QACE,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;QAClE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,sBAAsB,EAAE;KAC1D,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,GAAG,GAAG,CACX,OAAO,CAAC,MAAmC,CAAC,YAAY,EACzD,CAAC,CACF,CAAC;QACF,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAgC,CAAC;QACnE,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACrD,OAAO,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC,CACF,CAAC;IAEF,OAAO;IACP,OAAO,CAAC,IAAI,CACV,uBAAuB,EACvB;QACE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;QAC3B,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;KACnE,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,GAAG,GAAG,CACX,OAAO,CAAC,MAAmC,CAAC,YAAY,EACzD,CAAC,CACF,CAAC;QACF,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QAC9C,OAAO,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACxC,CAAC,CACF,CAAC;IAEF,OAAO;IACP,OAAO,CAAC,IAAI,CACV,qBAAqB,EACrB;QACE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;QAC3B,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;KACnE,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,GAAG,GAAG,CACX,OAAO,CAAC,MAAmC,CAAC,YAAY,EACzD,CAAC,CACF,CAAC;QACF,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAC5C,OAAO,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACxC,CAAC,CACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,OAAwB,EACxB,KAA8B;IAE9B,MAAM,OAAO,GAAG,IAAI,gBAAgB,EAAE,CAAC;IAEvC,cAAc;IACd,OAAO,CAAC,GAAG,CACT,OAAO,EACP,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EACtC,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,IAAI,GACN,OAAO,CAAC,KAAiC,CAAC,IAAe,IAAI,IAAI,CAAC;QACtE,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC7C,OAAO,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1E,CAAC,CACF,CAAC;IAEF,kBAAkB;IAClB,OAAO,CAAC,GAAG,CACT,QAAQ,EACR,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,EAC1C,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,IAAI,GAAI,OAAO,CAAC,MAA2B,CAAC,IAAI,CAAC;QACvD,OAAO,WAAW,CAAC,OAAO,CACxB,cAAc,CAAC,MAAM,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CACpD,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,aAAa;IACb,OAAO,CAAC,GAAG,CACT,aAAa,EACb,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,EACrC,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,IAAI,GAAI,OAAO,CAAC,MAA2B,CAAC,IAAI,CAAC;QACvD,MAAM,MAAM,GAAG,GAAG,CAAE,OAAO,CAAC,KAAiC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC1E,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,GACpE,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACtC,OAAO,WAAW,CAAC,OAAO,CAAC;YACzB,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,eAAe,EAAE,SAAS,CAAC,iBAAiB,IAAI,SAAS,CAAC,OAAO;YACjE,YAAY,EAAE,WAAW;YACzB,UAAU,EAAE,SAAS;YACrB,UAAU,EAAE,SAAS;YACrB,OAAO,EAAE,SAAS,CAAC,OAAO,IAAI,IAAI;YAClC,eAAe,EAAE,cAAc;SAChC,CAAC,CAAC;IACL,CAAC,CACF,CAAC;IAEF,aAAa;IACb,OAAO,CAAC,IAAI,CACV,QAAQ,EACR,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAC5D,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAqB,CAAC;QAC3C,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACzC,OAAO,WAAW,CAAC,OAAO,CACxB;YACE,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC;SACxC,EACD,MAAM,CACP,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import type { Agreement, AgreementHistory, UserAgreement } from "../../core/entities.js";
|
|
2
|
+
/** sys_agreement 表可排序列白名单(自有列,无敏感列) */
|
|
3
|
+
export declare const AGREEMENT_SORTABLE_COLUMNS: readonly string[];
|
|
4
|
+
/** sys_agreement_history 表可排序列白名单(自有列,无敏感列) */
|
|
5
|
+
export declare const AGREEMENT_HISTORY_SORTABLE_COLUMNS: readonly string[];
|
|
2
6
|
export declare class AgreementRepository {
|
|
3
7
|
findById(id: number): Promise<Agreement | undefined>;
|
|
4
8
|
findByCode(code: string, excludeStatus?: number): Promise<Agreement | undefined>;
|
|
5
|
-
listAgreements(page: number, size: number, keyword: string | null, type: string | null, status: number | null): Promise<{
|
|
9
|
+
listAgreements(page: number, size: number, keyword: string | null, type: string | null, status: number | null, sortBy?: string | null, sortOrder?: string | null): Promise<{
|
|
6
10
|
items: Agreement[];
|
|
7
11
|
total: number;
|
|
8
12
|
}>;
|
|
@@ -15,7 +19,7 @@ export declare class AgreementRepository {
|
|
|
15
19
|
createHistory(data: Record<string, unknown>): Promise<AgreementHistory>;
|
|
16
20
|
findHistoryById(id: number): Promise<AgreementHistory | undefined>;
|
|
17
21
|
findLatestHistoryByCode(code: string): Promise<AgreementHistory | undefined>;
|
|
18
|
-
listHistory(page: number, size: number, keyword: string | null, type: string | null, onlyArchive: boolean): Promise<{
|
|
22
|
+
listHistory(page: number, size: number, keyword: string | null, type: string | null, onlyArchive: boolean, sortBy?: string | null, sortOrder?: string | null): Promise<{
|
|
19
23
|
items: AgreementHistory[];
|
|
20
24
|
total: number;
|
|
21
25
|
}>;
|
|
@@ -4,9 +4,40 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { knex } from "../../core/database.js";
|
|
6
6
|
import { ModelRegistry } from "../../core/models.js";
|
|
7
|
+
import { applySort } from "../../common/sort.js";
|
|
7
8
|
const A = ModelRegistry.get("Agreement");
|
|
8
9
|
const AH = ModelRegistry.get("AgreementHistory");
|
|
9
10
|
const UA = ModelRegistry.get("UserAgreement");
|
|
11
|
+
/** sys_agreement 表可排序列白名单(自有列,无敏感列) */
|
|
12
|
+
export const AGREEMENT_SORTABLE_COLUMNS = [
|
|
13
|
+
"id",
|
|
14
|
+
"title",
|
|
15
|
+
"code",
|
|
16
|
+
"type",
|
|
17
|
+
"content",
|
|
18
|
+
"version",
|
|
19
|
+
"status",
|
|
20
|
+
"sort",
|
|
21
|
+
"is_published",
|
|
22
|
+
"published_at",
|
|
23
|
+
"published_version",
|
|
24
|
+
"created_at",
|
|
25
|
+
"updated_at",
|
|
26
|
+
];
|
|
27
|
+
/** sys_agreement_history 表可排序列白名单(自有列,无敏感列) */
|
|
28
|
+
export const AGREEMENT_HISTORY_SORTABLE_COLUMNS = [
|
|
29
|
+
"id",
|
|
30
|
+
"agreement_id",
|
|
31
|
+
"code",
|
|
32
|
+
"title",
|
|
33
|
+
"type",
|
|
34
|
+
"content",
|
|
35
|
+
"version",
|
|
36
|
+
"status",
|
|
37
|
+
"is_latest",
|
|
38
|
+
"created_at",
|
|
39
|
+
"updated_at",
|
|
40
|
+
];
|
|
10
41
|
export class AgreementRepository {
|
|
11
42
|
// ── Agreement ──
|
|
12
43
|
async findById(id) {
|
|
@@ -18,7 +49,7 @@ export class AgreementRepository {
|
|
|
18
49
|
q = q.whereNot("status", excludeStatus);
|
|
19
50
|
return (await q.first());
|
|
20
51
|
}
|
|
21
|
-
async listAgreements(page, size, keyword, type, status) {
|
|
52
|
+
async listAgreements(page, size, keyword, type, status, sortBy, sortOrder) {
|
|
22
53
|
let query = knex(A);
|
|
23
54
|
let countQuery = knex(A);
|
|
24
55
|
if (keyword) {
|
|
@@ -34,13 +65,17 @@ export class AgreementRepository {
|
|
|
34
65
|
query = query.where("status", status);
|
|
35
66
|
countQuery = countQuery.where("status", status);
|
|
36
67
|
}
|
|
37
|
-
const items = (await query
|
|
38
|
-
|
|
39
|
-
|
|
68
|
+
const items = (await applySort(query, sortBy, sortOrder, AGREEMENT_SORTABLE_COLUMNS, [
|
|
69
|
+
["sort", "asc"],
|
|
70
|
+
["id", "desc"],
|
|
71
|
+
])
|
|
40
72
|
.offset((page - 1) * size)
|
|
41
73
|
.limit(size));
|
|
42
74
|
const totalRow = await countQuery.count({ c: "*" }).first();
|
|
43
|
-
return {
|
|
75
|
+
return {
|
|
76
|
+
items,
|
|
77
|
+
total: Number(totalRow.c) || 0,
|
|
78
|
+
};
|
|
44
79
|
}
|
|
45
80
|
async create(data) {
|
|
46
81
|
const [id] = await knex(A).insert(data);
|
|
@@ -91,7 +126,7 @@ export class AgreementRepository {
|
|
|
91
126
|
.limit(1)
|
|
92
127
|
.first());
|
|
93
128
|
}
|
|
94
|
-
async listHistory(page, size, keyword, type, onlyArchive) {
|
|
129
|
+
async listHistory(page, size, keyword, type, onlyArchive, sortBy, sortOrder) {
|
|
95
130
|
let query = knex(AH);
|
|
96
131
|
let countQuery = knex(AH);
|
|
97
132
|
if (onlyArchive) {
|
|
@@ -107,12 +142,14 @@ export class AgreementRepository {
|
|
|
107
142
|
query = query.where("type", type);
|
|
108
143
|
countQuery = countQuery.where("type", type);
|
|
109
144
|
}
|
|
110
|
-
const items = (await query
|
|
111
|
-
.orderBy("created_at", "desc")
|
|
145
|
+
const items = (await applySort(query, sortBy, sortOrder, AGREEMENT_HISTORY_SORTABLE_COLUMNS, [["created_at", "desc"]])
|
|
112
146
|
.offset((page - 1) * size)
|
|
113
147
|
.limit(size));
|
|
114
148
|
const totalRow = await countQuery.count({ c: "*" }).first();
|
|
115
|
-
return {
|
|
149
|
+
return {
|
|
150
|
+
items,
|
|
151
|
+
total: Number(totalRow.c) || 0,
|
|
152
|
+
};
|
|
116
153
|
}
|
|
117
154
|
async deleteHistory(id) {
|
|
118
155
|
await knex(AH).where("id", id).del();
|
|
@@ -121,7 +158,10 @@ export class AgreementRepository {
|
|
|
121
158
|
await knex(AH).where("code", code).where("status", 1).update({ status });
|
|
122
159
|
}
|
|
123
160
|
async updateHistoryStatusByCodeVersion(code, version, status) {
|
|
124
|
-
await knex(AH)
|
|
161
|
+
await knex(AH)
|
|
162
|
+
.where("code", code)
|
|
163
|
+
.where("version", version)
|
|
164
|
+
.update({ status });
|
|
125
165
|
}
|
|
126
166
|
// ── UserAgreement ──
|
|
127
167
|
async countUserAgreement(code, version) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../../reglow/modules/agreement/repository.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../../reglow/modules/agreement/repository.ts"],"names":[],"mappings":"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"}
|