From 41cfdd4f74ba842b4660c25b29fd73c6a73e1a8f Mon Sep 17 00:00:00 2001
From: dataprince <dataprince@163.com>
Date: Sun, 3 Dec 2023 14:34:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E2=80=9C=E5=88=9B=E5=BB=BA=E8=80=85=E2=80=9D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BD=BF=E7=94=A8=E7=94=A8=E6=88=B7=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flex-ui/src/views/system/notice/index.vue             |  2 +-
 .../java/com/ruoyi/system/domain/vo/SysNoticeVo.java  | 11 ++++++++---
 .../java/com/ruoyi/system/domain/vo/SysUserVo.java    |  2 --
 .../system/service/impl/SysNoticeServiceImpl.java     |  8 ++++++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/flex-ui/src/views/system/notice/index.vue b/flex-ui/src/views/system/notice/index.vue
index eed81f9..71f249f 100644
--- a/flex-ui/src/views/system/notice/index.vue
+++ b/flex-ui/src/views/system/notice/index.vue
@@ -78,7 +78,7 @@
           <dict-tag :options="sys_notice_status" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="创建者" align="center" prop="createBy" width="100" />
+      <el-table-column label="创建者" align="center" prop="createByName" width="100" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="100">
         <template #default="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysNoticeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysNoticeVo.java
index 7ebfaed..ab08d5d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysNoticeVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysNoticeVo.java
@@ -1,7 +1,6 @@
 package com.ruoyi.system.domain.vo;
 
-import com.ruoyi.common.translation.annotation.Translation;
-import com.ruoyi.common.translation.constant.TransConstant;
+import com.mybatisflex.annotation.RelationOneToOne;
 import lombok.Data;
 
 import java.io.Serial;
@@ -56,10 +55,16 @@ public class SysNoticeVo implements Serializable {
      */
     private Long createBy;
 
+
     /**
      * 创建人名称
      */
-    @Translation(type = TransConstant.USER_ID_TO_NAME, mapper = "createBy")
+    @RelationOneToOne(
+        selfField = "createBy",
+        targetTable = "sys_user",
+        targetField = "userId",
+        valueField = "userName"
+    )
     private String createByName;
 
     /**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java
index 1f9e961..57dc66f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java
@@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.mybatisflex.annotation.ColumnMask;
 import com.mybatisflex.annotation.RelationOneToOne;
 import com.mybatisflex.core.mask.Masks;
-import com.ruoyi.common.translation.annotation.Translation;
-import com.ruoyi.common.translation.constant.TransConstant;
 import com.ruoyi.system.domain.SysUser;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
index 6621258..4a78484 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
@@ -13,6 +13,7 @@ import com.ruoyi.common.orm.core.page.TableDataInfo;
 import com.ruoyi.common.orm.core.service.impl.BaseServiceImpl;
 import com.ruoyi.system.domain.bo.SysNoticeBo;
 import com.ruoyi.system.domain.vo.SysNoticeVo;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.mapper.SysNoticeMapper;
@@ -28,6 +29,9 @@ import static com.ruoyi.system.domain.table.SysNoticeTableDef.SYS_NOTICE;
  */
 @Service
 public class SysNoticeServiceImpl extends BaseServiceImpl<SysNoticeMapper, SysNotice> implements ISysNoticeService {
+
+    @Resource
+    private SysNoticeMapper noticeMapper;
     @Override
     public QueryWrapper query() {
         return super.query().from(SYS_NOTICE);
@@ -75,7 +79,7 @@ public class SysNoticeServiceImpl extends BaseServiceImpl<SysNoticeMapper, SysNo
     @Override
     public List<SysNoticeVo> selectNoticeList(SysNoticeBo noticeBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(noticeBo);
-        return this.listAs(queryWrapper, SysNoticeVo.class);
+        return noticeMapper.selectListWithRelationsByQueryAs(queryWrapper, SysNoticeVo.class);
     }
 
     /**
@@ -87,7 +91,7 @@ public class SysNoticeServiceImpl extends BaseServiceImpl<SysNoticeMapper, SysNo
     @Override
     public TableDataInfo<SysNoticeVo> selectPage(SysNoticeBo noticeBo) {
         QueryWrapper queryWrapper = buildQueryWrapper(noticeBo);
-        Page<SysNoticeVo> page = this.pageAs(PageQuery.build(), queryWrapper, SysNoticeVo.class);
+        Page<SysNoticeVo> page = noticeMapper.paginateWithRelationsAs(PageQuery.build(), queryWrapper, SysNoticeVo.class);
         return TableDataInfo.build(page);
     }