From e76d382202ed5c8286b09593e05b2c36acde1c0f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期日, 09 十月 2022 15:50:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
index b65c6b6..66b8fda 100644
--- a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -10,6 +10,7 @@
import com.dg.core.db.manual.pojo.QueryResults;
import com.dg.core.db.manual.pojo.RecommendResult;
import com.dg.core.db.manual.pojo.Search;
+import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.ITransactionEventService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
@@ -29,6 +30,10 @@
@Autowired(required = true)
ITransactionEventService iTransactionEventService;
+
+ @Autowired(required = true)
+ IOrganizationChartService iOrganizationChartService;
+
/**
* 查询导办事务详情
* @param Id
@@ -36,7 +41,7 @@
*/
@ApiOperation("查询导办事务详情")
@GetMapping("/getData")
- @Authorization
+
public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
{
Assert.notNull(Id, "Id 不能为空");
@@ -50,16 +55,20 @@
*/
@ApiOperation("导办事物列表")
@GetMapping("/getList")
+ @Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
@RequestParam(value = "matterAndUser",required = false) String matterAndUser,
- @RequestParam(value = "classifyGrade",required = false) String classifyGrade)
+ @RequestParam(value = "classifyGrade",required = false) String classifyGrade,
+ @CurrentUser SysUser sysUser)
{
Assert.notNull(pageNum, "pageNum 不能为空");
Assert.notNull(pageSize, "pageSize 不能为空");
Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
- List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,matterAndUser,classifyGrade);
- int num=iTransactionEventService.countNum(matterAndUser,classifyGrade);
+ List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,matterAndUser,
+ classifyGrade,ids);
+ int num=iTransactionEventService.countNum(matterAndUser,classifyGrade,ids);
return getDataTable(list,num);
}
@@ -123,6 +132,7 @@
*/
@ApiOperation(value = "导办事务搜索",response = QueryResults.class)
@GetMapping("/queryKeyWordList")
+ @Authorization
public QueryResults queryMatterNameList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
@RequestParam(value = "recommendSize",required = false) Integer recommendSize,
--
Gitblit v1.7.1