From 8d6c9e116ddff7cc963ca18375ef05f593cdfa2d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 28 五月 2021 10:07:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
index abd4a17..e063470 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
@@ -1,13 +1,17 @@
package com.ruoyi.system.service.impl;
-import java.util.List;
-
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.system.domain.SysNotice;
import com.ruoyi.system.mapper.SysNoticeMapper;
import com.ruoyi.system.service.ISysNoticeService;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
/**
* 鍏憡 鏈嶅姟灞傚疄鐜�
@@ -16,8 +20,15 @@
*/
@Service
public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice> implements ISysNoticeService {
- @Autowired
- private SysNoticeMapper noticeMapper;
+
+ @Override
+ public TableDataInfo<SysNotice> selectPageNoticeList(SysNotice notice) {
+ LambdaQueryWrapper<SysNotice> lqw = new LambdaQueryWrapper<SysNotice>()
+ .like(StrUtil.isNotBlank(notice.getNoticeTitle()), SysNotice::getNoticeTitle, notice.getNoticeTitle())
+ .eq(StrUtil.isNotBlank(notice.getNoticeType()), SysNotice::getNoticeType, notice.getNoticeType())
+ .like(StrUtil.isNotBlank(notice.getCreateBy()), SysNotice::getCreateBy, notice.getCreateBy());
+ return PageUtils.buildDataInfo(page(PageUtils.buildPage(),lqw));
+ }
/**
* 鏌ヨ鍏憡淇℃伅
@@ -27,7 +38,7 @@
*/
@Override
public SysNotice selectNoticeById(Long noticeId) {
- return noticeMapper.selectNoticeById(noticeId);
+ return getById(noticeId);
}
/**
@@ -38,7 +49,10 @@
*/
@Override
public List<SysNotice> selectNoticeList(SysNotice notice) {
- return noticeMapper.selectNoticeList(notice);
+ return list(new LambdaQueryWrapper<SysNotice>()
+ .like(StrUtil.isNotBlank(notice.getNoticeTitle()),SysNotice::getNoticeTitle,notice.getNoticeTitle())
+ .eq(StrUtil.isNotBlank(notice.getNoticeType()),SysNotice::getNoticeType,notice.getNoticeType())
+ .like(StrUtil.isNotBlank(notice.getCreateBy()),SysNotice::getCreateBy,notice.getCreateBy()));
}
/**
@@ -49,7 +63,7 @@
*/
@Override
public int insertNotice(SysNotice notice) {
- return noticeMapper.insertNotice(notice);
+ return baseMapper.insert(notice);
}
/**
@@ -60,7 +74,7 @@
*/
@Override
public int updateNotice(SysNotice notice) {
- return noticeMapper.updateNotice(notice);
+ return baseMapper.updateById(notice);
}
/**
@@ -71,7 +85,7 @@
*/
@Override
public int deleteNoticeById(Long noticeId) {
- return noticeMapper.deleteNoticeById(noticeId);
+ return baseMapper.deleteById(noticeId);
}
/**
@@ -82,6 +96,6 @@
*/
@Override
public int deleteNoticeByIds(Long[] noticeIds) {
- return noticeMapper.deleteNoticeByIds(noticeIds);
+ return baseMapper.deleteBatchIds(Arrays.asList(noticeIds));
}
}
--
Gitblit v1.9.3