From 6f30b5c886cd05081d6250eb0506816fb2ac80ec Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 22 十一月 2022 14:11:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 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 6b62820..7100120 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("获取附件列表接口")
@@ -47,11 +47,13 @@
{
Page<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
- if(ids==null || ids.size()<1)
- {
- return getDataTable("您没有权限查看该数据");
+ List<ElseAccessoryEntity> list;
+ if (sysUser.getUserType().equals("1")||sysUser.getIsDivisionHead().equals("1")){
+ list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,null);
}
- List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids);
+ else {
+ list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,sysUser.getUserId());
+ }
int num=iElseAccessoryService.countNum(name,ids);
return getDataTable(list,num);
}
@@ -68,11 +70,7 @@
@CurrentUser SysUser sysUser)
{
List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
- if(ids==null || ids.size()<1)
- {
- return getDataTable("您没有权限查看该数据");
- }
- List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids);
+ List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids,sysUser.getUserId());
int num=iElseAccessoryService.countNum(Name,ids);
return getDataTable(list,num);
}
@@ -86,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)
{
@@ -107,7 +105,7 @@
{
return ResultData.error("部门不能为空");
}
-
+ entity.setCreateUserId(sysUser.getUserId());
return toAjax(iElseAccessoryService.insertConfig(entity));
}
--
Gitblit v1.7.1