seewe/seewis-hsl-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 优化 leave JSON 文件中的权限标志，并将 warm-flow 版本更新至 1.8.7

Browse Source
This commit is contained in:
疯狂的狮子Li
2026-05-15 13:45:09 +08:00
parent 3150a05d9a
commit 977cee2db5
10 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+1 -1
View File
@@ -55,7 +55,7 @@
<!-- 面向运行时的D-ORM依赖 -->
<anyline.version>8.7.3-20260306</anyline.version>
<!-- 工作流配置 -->
<warm-flow.version>1.8.4</warm-flow.version>
<warm-flow.version>1.8.7</warm-flow.version>
<!-- mqtt客户端 -->
<mica-mqtt.version>2.5.11</mica-mqtt.version>
<!-- mq配置 -->
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class SysUserExportVo implements Serializable {
private String phoneNumber;
/**
* 用户性别
* 用户性别（0男 1女 2未知）
*/
@ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_user_gender")
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class SysUserImportVo implements Serializable {
private String phoneNumber;
/**
* 用户性别
* 用户性别（0男 1女 2未知）
*/
@ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_user_gender")
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java
+1 -1
View File
@@ -109,7 +109,7 @@ public class FlowHisTaskVo implements Serializable {
* 审批者
*/
@Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "approver")
private String approveName;
private String approverName;
/**
* 协作人(只有转办、会签、票签、委派)
script/leave/leave1.json
+3 -3
View File
@@ -29,7 +29,7 @@
"nodeType": "1",
"nodeCode": "dd515cdd-59f6-446f-94ca-25ca062afb42",
"nodeName": "申请人",
"permissionFlag": "",
"permissionFlag": "${initiator}",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
@@ -54,7 +54,7 @@
"nodeType": "1",
"nodeCode": "78fa8e5b-e809-44ed-978a-41092409ebcf",
"nodeName": "组长",
"permissionFlag": "role:1",
"permissionFlag": "role:1761300000000000001",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
@@ -79,7 +79,7 @@
"nodeType": "1",
"nodeCode": "a8abf15f-b83e-428a-86cc-033555ea9bbe",
"nodeName": "部门主管",
"permissionFlag": "role:3@@role:4",
"permissionFlag": "role:1761300000000000003@@role:1761300000000000004",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
script/leave/leave2.json
+4 -4
View File
@@ -29,7 +29,7 @@
"nodeType": "1",
"nodeCode": "fdcae93b-b69c-498a-b231-09255e74bcbd",
"nodeName": "申请人",
"permissionFlag": "",
"permissionFlag": "${initiator}",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
@@ -86,7 +86,7 @@
"nodeType": "1",
"nodeCode": "b3528155-dcb7-4445-bbdf-3d00e3499e86",
"nodeName": "组长",
"permissionFlag": "3@@4",
"permissionFlag": "1761100000000000003@@1761100000000000004",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
@@ -111,7 +111,7 @@
"nodeType": "1",
"nodeCode": "c9fa6d7d-2a74-4e78-b947-0cad8a6af869",
"nodeName": "总经理",
"permissionFlag": "role:1",
"permissionFlag": "role:1761300000000000001",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
@@ -152,7 +152,7 @@
"nodeType": "1",
"nodeCode": "5ed2362b-fc0c-4d52-831f-95208b830605",
"nodeName": "部门领导",
"permissionFlag": "role:1",
"permissionFlag": "role:1761300000000000001",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
script/leave/leave3.json
+4 -4
View File
@@ -29,7 +29,7 @@
"nodeType": "1",
"nodeCode": "b7bbb571-06de-455c-8083-f83c07bf0b99",
"nodeName": "申请人",
"permissionFlag": "",
"permissionFlag": "${initiator}",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
@@ -86,7 +86,7 @@
"nodeType": "1",
"nodeCode": "4b7743cd-940c-431b-926f-e7b614fbf1fe",
"nodeName": "市场部",
"permissionFlag": "role:1",
"permissionFlag": "role:1761300000000000001",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
@@ -135,7 +135,7 @@
"nodeType": "1",
"nodeCode": "23e7429e-2b47-4431-b93e-40db7c431ce6",
"nodeName": "CEO",
"permissionFlag": "1",
"permissionFlag": "1761100000000000001",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
@@ -176,7 +176,7 @@
"nodeType": "1",
"nodeCode": "762cb975-37d8-4276-b6db-79a4c3606394",
"nodeName": "综合部",
"permissionFlag": "role:3@@role:4",
"permissionFlag": "role:1761300000000000003@@role:1761300000000000004",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
script/leave/leave4.json
+3 -3
View File
@@ -29,7 +29,7 @@
"nodeType": "1",
"nodeCode": "e90b98ef-35b4-410c-a663-bae8b7624b9f",
"nodeName": "申请人",
"permissionFlag": "",
"permissionFlag": "${initiator}",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
@@ -79,7 +79,7 @@
"nodeType": "1",
"nodeCode": "2f9f2e21-9bcf-42a3-a07c-13037aad22d1",
"nodeName": "全部审批通过",
"permissionFlag": "role:1@@role:3",
"permissionFlag": "role:1761300000000000001@@role:1761300000000000003",
"nodeRatio": "100.000",
"anyNodeSkip": null,
"listenerType": "",
@@ -104,7 +104,7 @@
"nodeType": "1",
"nodeCode": "27461e01-3d9f-4530-8fe3-bd5ec7f9571f",
"nodeName": "CEO",
"permissionFlag": "1",
"permissionFlag": "1761100000000000001",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
script/leave/leave5.json
+3 -3
View File
@@ -29,7 +29,7 @@
"nodeType": "1",
"nodeCode": "e1b04e96-dc81-4858-a309-2fe945d2f374",
"nodeName": "申请人",
"permissionFlag": "",
"permissionFlag": "${initiator}",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
@@ -86,7 +86,7 @@
"nodeType": "1",
"nodeCode": "c80f273e-1f17-4bd8-9ad1-04a4a94ea862",
"nodeName": "会签",
"permissionFlag": "role:1@@role:3",
"permissionFlag": "role:1761300000000000001@@role:1761300000000000003",
"nodeRatio": "100.000",
"anyNodeSkip": null,
"listenerType": "",
@@ -135,7 +135,7 @@
"nodeType": "1",
"nodeCode": "7a8f0473-e409-442e-a843-5c2b813d00e9",
"nodeName": "CEO",
"permissionFlag": "1",
"permissionFlag": "1761100000000000001",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
script/leave/leave6.json
+8 -8
View File
@@ -29,7 +29,7 @@
"nodeType": "1",
"nodeCode": "c25a0e86-fdd1-4f03-8e22-14db70389dbd",
"nodeName": "申请人",
"permissionFlag": "",
"permissionFlag": "${initiator}",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
@@ -54,7 +54,7 @@
"nodeType": "1",
"nodeCode": "2bfa3919-78cf-4bc1-b59b-df463a4546f9",
"nodeName": "副经理",
"permissionFlag": "role:1@@role:3@@role:4",
"permissionFlag": "role:1761300000000000001@@role:1761300000000000003@@role:1761300000000000004",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
@@ -79,7 +79,7 @@
"nodeType": "1",
"nodeCode": "ec17f60e-94e0-4d96-a3ce-3417e9d32d60",
"nodeName": "组长",
"permissionFlag": "1",
"permissionFlag": "1761100000000000001",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
@@ -104,7 +104,7 @@
"nodeType": "1",
"nodeCode": "07ecda1d-7a0a-47b5-8a91-6186c9473742",
"nodeName": "副组长",
"permissionFlag": "1",
"permissionFlag": "1761100000000000001",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
@@ -187,7 +187,7 @@
"nodeType": "1",
"nodeCode": "9c93a195-cff2-4e17-ab0a-a4f264191496",
"nodeName": "经理会签",
"permissionFlag": "1@@3",
"permissionFlag": "1761100000000000001@@1761100000000000003",
"nodeRatio": "100.000",
"anyNodeSkip": null,
"listenerType": "",
@@ -244,7 +244,7 @@
"nodeType": "1",
"nodeCode": "350dfa0c-a77c-4efa-8527-10efa02d8be4",
"nodeName": "总经理",
"permissionFlag": "3@@1",
"permissionFlag": "1761100000000000001@@1761100000000000003",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
@@ -269,7 +269,7 @@
"nodeType": "1",
"nodeCode": "fcfdd9f6-f526-4c1a-b71d-88afa31aebc5",
"nodeName": "副总经理",
"permissionFlag": "1@@3",
"permissionFlag": "1761100000000000001@@1761100000000000003",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",
@@ -318,7 +318,7 @@
"nodeType": "1",
"nodeCode": "3fcea762-b53a-4ae1-8365-7bec90444828",
"nodeName": "董事",
"permissionFlag": "1",
"permissionFlag": "1761100000000000001",
"nodeRatio": "0.000",
"anyNodeSkip": null,
"listenerType": "",