From 883a8006acf89681c72ac77b4f8d0d42f0f01856 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 24 十月 2022 14:30:26 +0800
Subject: [PATCH] 修改导办人员删除 bug
---
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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..0748d90 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;
@@ -80,7 +81,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 +139,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 +191,4 @@
}
return ids;
}
-
}
--
Gitblit v1.7.1