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 | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 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 c992dba..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
@@ -3,8 +3,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.ElseAccessoryEntity;
+import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IElseAccessoryService;
+import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.util.PermissionUtil;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -23,12 +27,14 @@
@Autowired
IElseAccessoryService iElseAccessoryService;
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
/**
* 获取附件列表
* @param pageNum
* @param pageSize
- * @param Name
+ * @param name
* @return
*/
@ApiOperation("获取附件列表接口")
@@ -36,11 +42,19 @@
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
- @RequestParam(value = "Name",required = false) String Name)
+ @RequestParam(value = "name",required = false) String name,
+ @CurrentUser SysUser sysUser)
{
Page<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
- List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,Name);
- int num=iElseAccessoryService.countNum(Name);
+ List<String> ids= PermissionUtil.getPermission(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);
}
@@ -51,10 +65,13 @@
*/
@ApiOperation("获取附件列表接口(全部)")
@GetMapping(path = "/getAllList")
- public TableDataInfo selectConfigListAll(@RequestParam(value = "Name",required = false) String Name)
+ @Authorization
+ public TableDataInfo selectConfigListAll(@RequestParam(value = "Name",required = false) String Name,
+ @CurrentUser SysUser sysUser)
{
- List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name);
- int num=iElseAccessoryService.countNum(Name);
+ List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids,sysUser.getUserId());
+ int num=iElseAccessoryService.countNum(Name,ids);
return getDataTable(list,num);
}
@@ -67,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)
{
@@ -88,7 +105,7 @@
{
return ResultData.error("部门不能为空");
}
-
+ entity.setCreateUserId(sysUser.getUserId());
return toAjax(iElseAccessoryService.insertConfig(entity));
}
--
Gitblit v1.7.1