From 7d98f48d82a5b2d0b4c42ea412fa160e41e3be9c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 10:54:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java b/flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java
index d1d4560..0b1388c 100644
--- a/flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/OrganizationAppletsController.java
@@ -28,7 +28,7 @@
@GetMapping("/getList")
public TableDataInfo selectConfigList()
{
- return getDataTable(iOrganizationChartService.selectConfigList("",""));
+ return getDataTable(iOrganizationChartService.selectConfigList("","" ,null));
}
@@ -47,7 +47,6 @@
*/
@ApiOperation(value = "根据id查取消组织机构",response = OrganizationChartEntity.class)
@GetMapping("/selectById")
- @Authorization
ResultData selectConfigById(@RequestParam("id") String id){
return ResultData.success(iOrganizationChartService.selectConfigById(id));
}
--
Gitblit v1.7.1