From 2edf8f5847bcc121a35c9aaee5531585e6b923f5 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 23 十一月 2022 13:55:35 +0800
Subject: [PATCH] 1.更改系统设置更改问题 2.新增导半人员设置创建人 3.搜索sql优化
---
flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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..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,7 +47,13 @@
{
Page<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
- List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids);
+ 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);
}
@@ -64,7 +70,7 @@
@CurrentUser SysUser sysUser)
{
List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
- 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);
}
@@ -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