通知公告返回创建人

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/pojo/vo/NoticeVO.java

@@ -20,4 +20,7 @@ public class NoticeVO extends Notice {
 	@Schema(description = "租户编号")
 	private String tenantId;
 
+	@Schema(description = "创建人")
+	private String createUserName;
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/notice/controller/NoticeController.java

@@ -48,6 +48,8 @@ import org.springblade.desk.feign.INoticeClient;
 import org.springblade.desk.notice.service.INoticeService;
 import org.springblade.desk.pojo.vo.NoticeVO;
 import org.springblade.desk.notice.wrapper.NoticeWrapper;
+import org.springblade.system.cache.DictCache;
+import org.springblade.system.pojo.enums.DictEnum;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
@@ -91,8 +93,12 @@ public class NoticeController extends BladeController {
 	@Operation(summary = "分页", description = "传入notice")
 	public R<IPage<NoticeVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> notice, Query query) {
 		NoticeWrapper.build().noticeQuery(notice);
-		IPage<Notice> pages = noticeService.page(Condition.getPage(query), Condition.getQueryWrapper(notice, Notice.class));
+		IPage<NoticeVO> pages = noticeService.selectPageEw(Condition.getPage(query), Condition.getQueryWrapper(notice, Notice.class));
-		return R.data(NoticeWrapper.build().pageVO(pages));
+		for (NoticeVO noticeVO : pages.getRecords()) {
+			String dictValue = DictCache.getValue(DictEnum.NOTICE, noticeVO.getCategory());
+			noticeVO.setCategoryName(dictValue);
+		}
+		return R.data(pages);
 	}
 
 	/**

blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/NoticeMapper.java

@@ -25,8 +25,10 @@
  */
 package org.springblade.desk.notice.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.desk.pojo.entity.Notice;
 import org.springblade.desk.pojo.vo.NoticeVO;
 
@@ -39,21 +41,29 @@ import java.util.List;
  */
 public interface NoticeMapper extends BaseMapper<Notice> {
 
-	/**
+    /**
-	 * 前N条数据
+     * 前N条数据
-	 *
+     *
-	 * @param number 数量
+     * @param number 数量
-	 * @return List<Notice>
+     * @return List<Notice>
-	 */
+     */
-	List<Notice> topList(Integer number);
+    List<Notice> topList(Integer number);
 
-	/**
+    /**
-	 * 自定义分页
+     * 自定义分页
-	 *
+     *
-	 * @param page   分页
+     * @param page   分页
-	 * @param notice 实体
+     * @param notice 实体
-	 * @return List<NoticeVO>
+     * @return List<NoticeVO>
-	 */
+     */
-	List<NoticeVO> selectNoticePage(IPage page, NoticeVO notice);
+    List<NoticeVO> selectNoticePage(IPage page, NoticeVO notice);
+
+    /**
+     * 自定义分页
+     * @param page
+     * @param queryWrapper
+     * @return
+     */
+    List<NoticeVO> selectPageEw(IPage page, @Param("ew") QueryWrapper<Notice> queryWrapper);
 
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/NoticeMapper.xml

@@ -28,6 +28,7 @@
         <result column="release_time" property="releaseTime"/>
         <result column="title" property="title"/>
         <result column="content" property="content"/>
+        <result column="create_user_name" property="createUserName"/>
     </resultMap>
 
     <select id="topList" resultMap="noticeResultMap">
@@ -51,4 +52,14 @@
         </if>
     </select>
 
+    <select id="selectPageEw" resultMap="noticeVOResultMap">
+        SELECT
+            n.*,
+            bu.REAL_NAME as create_user_name
+        FROM
+        blade_notice n
+        LEFT JOIN blade_user bu on n.create_user = bu.id
+        ${ew.customSqlSegment}
+    </select>
+
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/notice/service/INoticeService.java

@@ -25,6 +25,7 @@
  */
 package org.springblade.desk.notice.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.desk.pojo.entity.Notice;
@@ -45,4 +46,11 @@ public interface INoticeService extends BaseService<Notice> {
 	 */
 	IPage<NoticeVO> selectNoticePage(IPage<NoticeVO> page, NoticeVO notice);
 
+	/**
+	 * 自定义分页查询
+	 * @param page
+	 * @param queryWrapper
+	 * @return
+	 */
+	IPage<NoticeVO> selectPageEw(IPage<NoticeVO> page, QueryWrapper<Notice> queryWrapper);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/notice/service/impl/NoticeServiceImpl.java

@@ -25,6 +25,7 @@
  */
 package org.springblade.desk.notice.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -49,4 +50,9 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 		return page.setRecords(baseMapper.selectNoticePage(page, notice));
 	}
 
+	@Override
+	public IPage<NoticeVO> selectPageEw(IPage<NoticeVO> page, QueryWrapper<Notice> queryWrapper) {
+		return page.setRecords(baseMapper.selectPageEw(page, queryWrapper));
+	}
+
 }