From 1de0a85c067ceb62413d0f458899dca41b8322d0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 17:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/AutomessagePolicyDocumentsController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/AutomessagePolicyDocumentsController.java b/flower_city/src/main/java/com/dg/core/controller/AutomessagePolicyDocumentsController.java
index 005855c..f085289 100644
--- a/flower_city/src/main/java/com/dg/core/controller/AutomessagePolicyDocumentsController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/AutomessagePolicyDocumentsController.java
@@ -7,12 +7,14 @@
import com.dg.core.db.gen.entity.AutomessagePolicyDocuments;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IAutomessagePolicyDocumentsService;
+import com.dg.core.service.IOrganizationChartService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -25,6 +27,9 @@
@Resource
private IAutomessagePolicyDocumentsService iAutomessagePolicyDocumentsService;
+
+ @Resource
+ private IOrganizationChartService iOrganizationChartService;
/**
* 获取法律法规政策文件列表（分页）
@@ -44,8 +49,12 @@
@RequestParam(value = "departmentId",required = false) Integer departmentId,
@CurrentUser SysUser sysUser){
Page<AutomessagePolicyDocuments> pageParam = new Page<>(pageNum,pageSize);
- List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(pageParam,pageSize,name,type,sysUser,departmentId);
- return getDataTable(list,iAutomessagePolicyDocumentsService.selectCountList(name,type,departmentId));
+ List<String> ids=null;
+ if (sysUser!=null&&(sysUser.getUserType().equals("2")||sysUser.getIsDivisionHead().equals("1"))){
+ ids=iOrganizationChartService.getDepartmentId(sysUser.getDepartmentId());
+ }
+ List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(pageParam,pageSize,name,type,sysUser,departmentId,ids);
+ return getDataTable(list,iAutomessagePolicyDocumentsService.selectCountList(name,type,departmentId,ids));
}
/**
@@ -62,7 +71,7 @@
public ResultData selectConfigList(@RequestParam(value = "name",required = false) String name,
@RequestParam(value = "type",required = false) String type,
@RequestParam(value = "departmentId",required = false) Integer departmentId){
- List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(name,type,departmentId);
+ List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(name,type,departmentId,null);
return ResultData.success(list);
}
--
Gitblit v1.7.1