From e87d9f3de8d80ccdca1aaad4c5ff75abf9801428 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 16 十一月 2022 17:19:41 +0800
Subject: [PATCH] 1.添加智能质询访问表实体类 2.添加智能质询访问相关功能并统计数据 3.修改门户网搜索结果
---
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 eeb3607..db89d01 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
@@ -8,6 +8,7 @@
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;
@@ -33,7 +34,7 @@
* 获取附件列表
* @param pageNum
* @param pageSize
- * @param Name
+ * @param name
* @return
*/
@ApiOperation("获取附件列表接口")
@@ -45,8 +46,13 @@
@CurrentUser SysUser sysUser)
{
Page<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
- List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
- List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids);
+ List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ List<ElseAccessoryEntity> list;
+ if (sysUser.getUserType().equals("2")){
+ list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,sysUser.getUserId());}
+ else {
+ list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,null);
+ }
int num=iElseAccessoryService.countNum(name,ids);
return getDataTable(list,num);
}
@@ -62,8 +68,8 @@
public TableDataInfo selectConfigListAll(@RequestParam(value = "Name",required = false) String Name,
@CurrentUser SysUser sysUser)
{
- List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
- List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids);
+ 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);
}
@@ -77,7 +83,7 @@
@ApiOperation("新增附件")
@PostMapping(path = "/add")
@Authorization
- public ResultData insertConfig(@RequestBody ElseAccessoryEntity entity)
+ public ResultData insertConfig(@RequestBody ElseAccessoryEntity entity,@CurrentUser SysUser sysUser)
{
if(entity==null)
{
@@ -98,7 +104,7 @@
{
return ResultData.error("部门不能为空");
}
-
+ entity.setCreateUserId(sysUser.getUserId());
return toAjax(iElseAccessoryService.insertConfig(entity));
}
--
Gitblit v1.7.1