BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 668870d05206786d101d89ffb8584bca80f457a5

Authored by YunaiV
1 parent 4386c701

【同步】BOOT 和 CLOUD 的功能

Inline Side-by-side
Showing 4 changed files with 5 additions and 5 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
  View file @668870d
@@ -135,7 +135,7 @@ public class BpmProcessInstanceController { @@ -135,7 +135,7 @@ public class BpmProcessInstanceController {
135 processDefinitionService.getProcessDefinitionBpmnModel(processInstance.getProcessDefinitionId())); 135 processDefinitionService.getProcessDefinitionBpmnModel(processInstance.getProcessDefinitionId()));
136 AdminUserRespDTO startUser = adminUserApi.getUser(NumberUtils.parseLong(processInstance.getStartUserId())); 136 AdminUserRespDTO startUser = adminUserApi.getUser(NumberUtils.parseLong(processInstance.getStartUserId()));
137 DeptRespDTO dept = null; 137 DeptRespDTO dept = null;
138 - if (startUser != null) { 138 + if (startUser != null && startUser.getDeptId() != null) {
139 dept = deptApi.getDept(startUser.getDeptId()); 139 dept = deptApi.getDept(startUser.getDeptId());
140 } 140 }
141 return success(BpmProcessInstanceConvert.INSTANCE.buildProcessInstance(processInstance, 141 return success(BpmProcessInstanceConvert.INSTANCE.buildProcessInstance(processInstance,
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
  View file @668870d
@@ -94,7 +94,7 @@ public class ConfigController { @@ -94,7 +94,7 @@ public class ConfigController {
94 @Operation(summary = "导出参数配置") 94 @Operation(summary = "导出参数配置")
95 @PreAuthorize("@ss.hasPermission('infra:config:export')") 95 @PreAuthorize("@ss.hasPermission('infra:config:export')")
96 @ApiAccessLog(operateType = EXPORT) 96 @ApiAccessLog(operateType = EXPORT)
97 - public void exportConfig(@Valid ConfigPageReqVO exportReqVO, 97 + public void exportConfig(ConfigPageReqVO exportReqVO,
98 HttpServletResponse response) throws IOException { 98 HttpServletResponse response) throws IOException {
99 exportReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); 99 exportReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
100 List<ConfigDO> list = configService.getConfigPage(exportReqVO).getList(); 100 List<ConfigDO> list = configService.getConfigPage(exportReqVO).getList();
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/config/ConfigService.java
  View file @668870d
@@ -58,6 +58,6 @@ public interface ConfigService { @@ -58,6 +58,6 @@ public interface ConfigService {
58 * @param reqVO 分页条件 58 * @param reqVO 分页条件
59 * @return 分页列表 59 * @return 分页列表
60 */ 60 */
61 - PageResult<ConfigDO> getConfigPage(@Valid ConfigPageReqVO reqVO); 61 + PageResult<ConfigDO> getConfigPage(ConfigPageReqVO reqVO);
62 62
63 } 63 }
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
  View file @668870d
@@ -306,8 +306,8 @@ export default { @@ -306,8 +306,8 @@ export default {
306 await this.#[[$modal]]#.confirm('是否确认导出所有${table.classComment}数据项?'); 306 await this.#[[$modal]]#.confirm('是否确认导出所有${table.classComment}数据项?');
307 try { 307 try {
308 this.exportLoading = true; 308 this.exportLoading = true;
309 - const res = await ${simpleClassName}Api.export${simpleClassName}Excel(this.queryParams);  
310 - this.#[[$]]#download.excel(res.data, '${table.classComment}.xls'); 309 + const data = await ${simpleClassName}Api.export${simpleClassName}Excel(this.queryParams);
  310 + this.#[[$]]#download.excel(data, '${table.classComment}.xls');
311 } catch { 311 } catch {
312 } finally { 312 } finally {
313 this.exportLoading = false; 313 this.exportLoading = false;