Commit bfcc1987cb1e8675f7e8d540c55a5d5a5be09c64
Committed by
YunaiV
YunaiV
1 parent
1978603b
fix: 【BPM 工作流】避免在 BpmHttpRequestUtils 中重复添加 processInstanceId 参数
Showing
5 changed files
with
7 additions
and
5 deletions
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmHttpRequestUtils.java
| @@ -108,7 +108,9 @@ public class BpmHttpRequestUtils { | @@ -108,7 +108,9 @@ public class BpmHttpRequestUtils { | ||
| 108 | Map<String, Object> processVariables = processInstance.getProcessVariables(); | 108 | Map<String, Object> processVariables = processInstance.getProcessVariables(); |
| 109 | MultiValueMap<String, String> body = new LinkedMultiValueMap<>(); | 109 | MultiValueMap<String, String> body = new LinkedMultiValueMap<>(); |
| 110 | addHttpRequestParam(body, bodySettings, processVariables); | 110 | addHttpRequestParam(body, bodySettings, processVariables); |
| 111 | - body.add("processInstanceId", processInstance.getId()); | 111 | + if (!body.containsKey("processInstanceId")) { // 避免重复添加 |
| 112 | + body.add("processInstanceId", processInstance.getId()); | ||
| 113 | + } | ||
| 112 | return body; | 114 | return body; |
| 113 | } | 115 | } |
| 114 | 116 |
yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm
| @@ -180,7 +180,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ | @@ -180,7 +180,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ | ||
| 180 | #end | 180 | #end |
| 181 | }, | 181 | }, |
| 182 | toolbarConfig: { | 182 | toolbarConfig: { |
| 183 | - refresh: { code: 'query' }, | 183 | + refresh: true, |
| 184 | search: true, | 184 | search: true, |
| 185 | }, | 185 | }, |
| 186 | } as VxeTableGridOptions<${simpleClassName}Api.${simpleClassName}>, | 186 | } as VxeTableGridOptions<${simpleClassName}Api.${simpleClassName}>, |
yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm
| @@ -131,7 +131,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ | @@ -131,7 +131,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ | ||
| 131 | enabled: true, | 131 | enabled: true, |
| 132 | }, | 132 | }, |
| 133 | toolbarConfig: { | 133 | toolbarConfig: { |
| 134 | - refresh: { code: 'query' }, | 134 | + refresh: true, |
| 135 | search: true, | 135 | search: true, |
| 136 | }, | 136 | }, |
| 137 | #else | 137 | #else |
yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/index.vue.vm
| @@ -174,7 +174,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ | @@ -174,7 +174,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ | ||
| 174 | #end | 174 | #end |
| 175 | }, | 175 | }, |
| 176 | toolbarConfig: { | 176 | toolbarConfig: { |
| 177 | - refresh: { code: 'query' }, | 177 | + refresh: true, |
| 178 | search: true, | 178 | search: true, |
| 179 | }, | 179 | }, |
| 180 | } as VxeTableGridOptions<${simpleClassName}Api.${simpleClassName}>, | 180 | } as VxeTableGridOptions<${simpleClassName}Api.${simpleClassName}>, |
yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/modules/list_sub_erp.vue.vm
| @@ -125,7 +125,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ | @@ -125,7 +125,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ | ||
| 125 | enabled: true, | 125 | enabled: true, |
| 126 | }, | 126 | }, |
| 127 | toolbarConfig: { | 127 | toolbarConfig: { |
| 128 | - refresh: { code: 'query' }, | 128 | + refresh: true, |
| 129 | search: true, | 129 | search: true, |
| 130 | }, | 130 | }, |
| 131 | #else | 131 | #else |