From 2d26c2b864cad8b988adc5258e3e06eaff4c35a4 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 24 十月 2022 15:14:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 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 de7cf8c..2bc7daa 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,22 @@
@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)
+ {
+ List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ List<OrganizationChartEntity> organizations=iOrganizationChartService.selectConfigList("","",ids);
+
+ return getDataTable(organizations);
}
/**
@@ -80,7 +96,7 @@
public ResultData updateConfig(@RequestBody OrganizationChartEntity entity,@CurrentUser SysUser sysUser)
{
entity.setUpdateTime(LocalDateTime.now());
- entity.setUpdateUserId(Integer.parseInt(String.valueOf(sysUser.getUserId())));
+ entity.setUpdateUserId(sysUser.getUserId());
return toAjax(iOrganizationChartService.updateConfig(entity));
}
@@ -138,11 +154,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));
}
@@ -187,5 +206,4 @@
}
return ids;
}
-
}
--
Gitblit v1.7.1