lbqms.git - Gitblit

			@@ -1,17 +1,17 @@
			package com.ruoyi.system.service.impl;

			import cn.hutool.core.bean.BeanUtil;
			import cn.hutool.core.util.ObjectUtil;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.ruoyi.common.core.utils.MapstructUtils;
			import com.ruoyi.common.core.utils.StringUtils;
			import com.ruoyi.common.mybatis.core.page.PageQuery;
			import com.ruoyi.common.mybatis.core.page.TableDataInfo;
			import com.ruoyi.system.domain.SysNotice;
			import com.ruoyi.system.domain.SysUser;
			import com.ruoyi.system.domain.bo.SysNoticeBo;
			import com.ruoyi.system.domain.vo.SysNoticeVo;
			import com.ruoyi.system.domain.vo.SysUserVo;
			import com.ruoyi.system.mapper.SysNoticeMapper;
			import com.ruoyi.system.mapper.SysUserMapper;
			import com.ruoyi.system.service.ISysNoticeService;
			@@ -68,7 +68,7 @@
			lqw.like(StringUtils.isNotBlank(bo.getNoticeTitle()), SysNotice::getNoticeTitle, bo.getNoticeTitle());
			lqw.eq(StringUtils.isNotBlank(bo.getNoticeType()), SysNotice::getNoticeType, bo.getNoticeType());
			if (StringUtils.isNotBlank(bo.getCreateByName())) {
			SysUser sysUser = userMapper.selectUserByUserName(bo.getCreateByName());
			SysUserVo sysUser = userMapper.selectUserByUserName(bo.getCreateByName());
			lqw.eq(SysNotice::getCreateBy, ObjectUtil.isNotNull(sysUser) ? sysUser.getUserId() : null);
			}
			return lqw;
			@@ -82,7 +82,7 @@
			*/
			@Override
			public int insertNotice(SysNoticeBo bo) {
			SysNotice notice = BeanUtil.toBean(bo, SysNotice.class);
			SysNotice notice = MapstructUtils.convert(bo, SysNotice.class);
			return baseMapper.insert(notice);
			}

			@@ -94,7 +94,7 @@
			*/
			@Override
			public int updateNotice(SysNoticeBo bo) {
			SysNotice notice = BeanUtil.toBean(bo, SysNotice.class);
			SysNotice notice = MapstructUtils.convert(bo, SysNotice.class);
			return baseMapper.updateById(notice);
			}