From 922a8345e2b7e2b52c629fffe81d6b5af91a81ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Fri, 3 Feb 2023 11:06:52 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20oss=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/system/domain/vo/SysOssVo.java   |  8 ++++++++
 ruoyi-ui/src/views/system/oss/index.vue             | 13 +------------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java
index 6aab7736..bbbbf878 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java
@@ -1,5 +1,7 @@
 package com.ruoyi.system.domain.vo;
 
+import com.ruoyi.common.translation.annotation.Translation;
+import com.ruoyi.common.translation.constant.TransConstant;
 import lombok.Data;
 
 import java.io.Serial;
@@ -52,6 +54,12 @@ public class SysOssVo implements Serializable {
      */
     private Long createBy;
 
+    /**
+     * 上传人名称
+     */
+    @Translation(type = TransConstant.USER_ID_TO_NAME, mapper = "createBy")
+    private String createByName;
+
     /**
      * 服务商
      */
diff --git a/ruoyi-ui/src/views/system/oss/index.vue b/ruoyi-ui/src/views/system/oss/index.vue
index 9f8557ca..ae6e4d87 100644
--- a/ruoyi-ui/src/views/system/oss/index.vue
+++ b/ruoyi-ui/src/views/system/oss/index.vue
@@ -40,15 +40,6 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="上传人" prop="createBy">
-        <el-input
-          v-model="queryParams.createBy"
-          placeholder="请输入上传人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="服务商" prop="service">
         <el-input
           v-model="queryParams.service"
@@ -144,7 +135,7 @@
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="上传人" align="center" prop="createBy" />
+      <el-table-column label="上传人" align="center" prop="createByName" />
       <el-table-column label="服务商" align="center" prop="service"
                        sortable="custom"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -236,9 +227,7 @@ export default {
         fileName: undefined,
         originalName: undefined,
         fileSuffix: undefined,
-        url: undefined,
         createTime: undefined,
-        createBy: undefined,
         service: undefined
       },
       // 表单参数