From 7044df54b1809b1b09e8f20cdf9aef653f9ed12a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 11:02:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
index 4699d53..c55fa12 100644
--- a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
@@ -9,6 +9,7 @@
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.ITransactionEventService;
+import com.dg.core.util.PermissionUtil;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -41,7 +42,19 @@
@GetMapping("/getList")
public TableDataInfo selectConfigList()
{
- return getDataTable(iOrganizationChartService.selectConfigList("",""));
+ return getDataTable(iOrganizationChartService.selectConfigList("","",null));
+ }
+
+
+ /**
+ * 查询机构列表(权限)
+ */
+ @ApiOperation(value = "查询机构列表(权限 选择用 ) ",response = OrganizationChartEntity.class)
+ @GetMapping("/selectJurisdiction")
+ @Authorization
+ public TableDataInfo selectJurisdiction(@CurrentUser SysUser sysUser)
+ {
+ return getDataTable(iOrganizationChartService.selectConfigList(sysUser.getDepartmentId(),"",null));
}
/**
@@ -138,11 +151,14 @@
@Authorization
public TableDataInfo queryList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
- @RequestParam(value = "organizationName",required = false)String organizationName){
+ @RequestParam(value = "organizationName",required = false)String organizationName,
+ @CurrentUser SysUser sysUser){
Assert.notNull(pageNum, "pageNum can not be empty");
Assert.notNull(pageSize, "pageSize can not be empty");
Page<OrganizationChartEntity> pageParam = new Page<>(pageNum,pageSize);
- return getDataTable(iOrganizationChartService.queryList(pageParam,pageSize,organizationName),iOrganizationChartService.countList(organizationName));
+ List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ return getDataTable(iOrganizationChartService.queryList(pageParam,pageSize,organizationName,ids),
+ iOrganizationChartService.countList(organizationName,ids));
}
@@ -156,7 +172,17 @@
public TableDataInfo getOrganizations(@RequestParam(value = "department",required = false) String departmentId)
{
List<OrganizationChartEntity> ids=new ArrayList<>();
- List<OrganizationChartEntity> lists = iOrganizationChartService.selectParentList(departmentId,"");
+ List<OrganizationChartEntity> lists=null;
+ if(StringUtils.isEmpty(departmentId))
+ {
+ lists= iOrganizationChartService.selectParentList(null,"1");
+
+ }
+ else
+ {
+ lists= iOrganizationChartService.selectParentList(departmentId,null);
+ }
+
if(lists.size()<1)
{
lists.add(iOrganizationChartService.selectConfigById(departmentId));
@@ -166,7 +192,12 @@
{
return null;
}
- ids.add(iOrganizationChartService.selectConfigById(departmentId));
+
+ if(!StringUtils.isEmpty(departmentId))
+ {
+ ids.add(iOrganizationChartService.selectConfigById(departmentId));
+ }
+
return getDataTable(ids);
}
--
Gitblit v1.7.1