From 332d39b3abc1adf5739517cdbfab75df35410005 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 30 十一月 2022 15:01:13 +0800
Subject: [PATCH] 修改处理导办工单显示模板不正确
---
flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java b/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
index f1db3a1..7a38d744 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
@@ -34,7 +34,7 @@
* 获取附件列表
* @param pageNum
* @param pageSize
- * @param Name
+ * @param name
* @return
*/
@ApiOperation("获取附件列表接口")
@@ -46,8 +46,14 @@
@CurrentUser SysUser sysUser)
{
Page<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
- List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
- List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids);
+ List<String> ids= PermissionUtil.getStairDepartment(sysUser,iOrganizationChartService);
+ List<ElseAccessoryEntity> list;
+ if (sysUser.getUserType().equals("1")||sysUser.getIsDivisionHead().equals("1")){
+ list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,null);
+ }
+ else {
+ list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,sysUser.getUserId());
+ }
int num=iElseAccessoryService.countNum(name,ids);
return getDataTable(list,num);
}
@@ -63,8 +69,8 @@
public TableDataInfo selectConfigListAll(@RequestParam(value = "Name",required = false) String Name,
@CurrentUser SysUser sysUser)
{
- List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
- List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids);
+ List<String> ids= PermissionUtil.getStairDepartment(sysUser,iOrganizationChartService);
+ List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids,sysUser.getUserId());
int num=iElseAccessoryService.countNum(Name,ids);
return getDataTable(list,num);
}
@@ -78,7 +84,7 @@
@ApiOperation("新增附件")
@PostMapping(path = "/add")
@Authorization
- public ResultData insertConfig(@RequestBody ElseAccessoryEntity entity)
+ public ResultData insertConfig(@RequestBody ElseAccessoryEntity entity,@CurrentUser SysUser sysUser)
{
if(entity==null)
{
@@ -99,7 +105,7 @@
{
return ResultData.error("部门不能为空");
}
-
+ entity.setCreateUserId(sysUser.getUserId());
return toAjax(iElseAccessoryService.insertConfig(entity));
}
--
Gitblit v1.7.1