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/service/impl/AutomessagePolicyDocumentsServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java
index eb62e65..e06544e 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java
@@ -16,8 +16,8 @@
public class AutomessagePolicyDocumentsServiceImpl extends ServiceImpl<AutomessagePolicyDocumentsMapper, AutomessagePolicyDocuments> implements IAutomessagePolicyDocumentsService {
@Override
- public List<AutomessagePolicyDocuments> selectConfigList(IPage<AutomessagePolicyDocuments> page, Integer state, String name, String type, SysUser sysUser,Integer departmentId) {
- List<AutomessagePolicyDocuments> automessagePolicyDocumentsList = baseMapper.selectConfigList(page, state, name, type, departmentId);
+ public List<AutomessagePolicyDocuments> selectConfigList(IPage<AutomessagePolicyDocuments> page, Integer state, String name, String type, SysUser sysUser,Integer departmentId, List<String> ids) {
+ List<AutomessagePolicyDocuments> automessagePolicyDocumentsList = baseMapper.selectConfigList(page, state, name, type, departmentId, ids);
if (sysUser!=null){
for (AutomessagePolicyDocuments automessagePolicyDocuments:automessagePolicyDocumentsList) {
if(sysUser.getUserType().equals("1")){//超级管理员
@@ -42,8 +42,8 @@
}
@Override
- public List<AutomessagePolicyDocuments> selectConfigList(String name, String type,Integer departmentId) {
- return baseMapper.selectConfigList(name,type,departmentId);
+ public List<AutomessagePolicyDocuments> selectConfigList(String name, String type,Integer departmentId, List<String> ids) {
+ return baseMapper.selectConfigList(name,type,departmentId,ids);
}
@Override
@@ -71,8 +71,8 @@
}
@Override
- public Integer selectCountList(String name,String type,Integer departmentId) {
- return baseMapper.selectCountList(name,type,departmentId);
+ public Integer selectCountList(String name,String type,Integer departmentId,List<String> ids) {
+ return baseMapper.selectCountList(name,type,departmentId,ids);
}
--
Gitblit v1.7.1