lbqms.git - Gitblit

			@@ -1,14 +1,15 @@
			package org.dromara.system.service.impl;

			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 org.dromara.common.core.utils.MapstructUtils;
			import org.dromara.common.core.utils.ObjectUtils;
			import org.dromara.common.core.utils.StringUtils;
			import org.dromara.common.mybatis.core.page.PageQuery;
			import org.dromara.common.mybatis.core.page.TableDataInfo;
			import org.dromara.system.domain.SysNotice;
			import org.dromara.system.domain.SysUser;
			import org.dromara.system.domain.bo.SysNoticeBo;
			import org.dromara.system.domain.vo.SysNoticeVo;
			import org.dromara.system.domain.vo.SysUserVo;
			@@ -68,9 +69,10 @@
			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())) {
			SysUserVo sysUser = userMapper.selectUserByUserName(bo.getCreateByName());
			lqw.eq(SysNotice::getCreateBy, ObjectUtil.isNotNull(sysUser) ? sysUser.getUserId() : null);
			SysUserVo sysUser = userMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, bo.getCreateByName()));
			lqw.eq(SysNotice::getCreateBy, ObjectUtils.notNullGetter(sysUser, SysUserVo::getUserId));
			}
			lqw.orderByAsc(SysNotice::getNoticeId);
			return lqw;
			}

			@@ -117,6 +119,6 @@
			*/
			@Override
			public int deleteNoticeByIds(Long[] noticeIds) {
			return baseMapper.deleteBatchIds(Arrays.asList(noticeIds));
			return baseMapper.deleteByIds(Arrays.asList(noticeIds));
			}
			}