From cbe2ff4c5da84a0c7d54dee16d1cbeab12804e91 Mon Sep 17 00:00:00 2001
From: yxh <yxh1103@qq.com>
Date: Wed, 12 Jul 2023 21:33:54 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/sysJob/list/component/detail.vue   | 24 ++++++-------------
 .../system/sysJob/list/component/model.ts     |  2 ++
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/views/system/sysJob/list/component/detail.vue b/src/views/system/sysJob/list/component/detail.vue
index c5bc48f..e0ba498 100644
--- a/src/views/system/sysJob/list/component/detail.vue
+++ b/src/views/system/sysJob/list/component/detail.vue
@@ -32,10 +32,10 @@
             <el-form-item label="状态">{{ proxy.getOptionValue(formData.status, statusOptions,'value','label') }}</el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="创建者">{{ formData.createdBy }}</el-form-item>
+            <el-form-item label="创建者">{{ formData.createdUser.userNickname }}</el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="更新者">{{ formData.updatedBy }}</el-form-item>
+            <el-form-item label="更新者">{{ formData.updatedUser.userNickname }}</el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="备注信息">{{ formData.remark }}</el-form-item>
@@ -146,6 +146,8 @@
           remark: undefined,
           createdAt: undefined,
           updatedAt: undefined,
+          createdUser:{userNickname:''},
+          updatedUser:{userNickname:''}
         },
         // 表单校验
         rules: {}
@@ -155,21 +157,7 @@
           resetForm();
           if(row) {
             getSysJob(row.jobId!).then((res:any)=>{
-              const data = res.data;
-              let listUid = [];
-              listUid.push(data.createdBy,data.updatedBy)
-              getUserList(listUid).then((response:any) =>{
-                let users = response.data.list||[]
-                users.forEach((user:any)=>{
-                  if(data.createdBy==user.id){
-                    data.createdBy = user.userNickname
-                  }
-                  if(data.updatedBy==user.id){
-                    data.updatedBy = user.userNickname
-                  }
-                })
-                state.formData = data;
-              })
+              state.formData = res.data;
             })
             logList.loading=true
             getLogList(row.invokeTarget!);
@@ -208,6 +196,8 @@
             remark: undefined,
             createdAt: undefined,
             updatedAt: undefined,
+            createdUser:{userNickname:''},
+            updatedUser:{userNickname:''}
           }
         };
         // 多选框选中数据
diff --git a/src/views/system/sysJob/list/component/model.ts b/src/views/system/sysJob/list/component/model.ts
index a31a6d3..1ec624b 100644
--- a/src/views/system/sysJob/list/component/model.ts
+++ b/src/views/system/sysJob/list/component/model.ts
@@ -24,6 +24,8 @@ export interface SysJobInfoData {
     remark:string|undefined; // 备注信息
     createdAt:string|undefined; // 创建时间
     updatedAt:string|undefined; // 更新时间
+    createdUser:{userNickname:string};
+    updatedUser:{userNickname:string};
 }