From 430c4ad74b76c8222a7937d641660f4b4e30dea2 Mon Sep 17 00:00:00 2001
From: User_cyk <1020691186@qq.com>
Date: Tue, 11 Jul 2023 12:46:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9onefile=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/hellogithub/entity/fileEntity.java      | 11 +++++++++++
 src/com/hellogithub/service/oneFileService.java | 11 ++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/com/hellogithub/entity/fileEntity.java b/src/com/hellogithub/entity/fileEntity.java
index e160e57..cc3d044 100644
--- a/src/com/hellogithub/entity/fileEntity.java
+++ b/src/com/hellogithub/entity/fileEntity.java
@@ -83,4 +83,15 @@ public class fileEntity {
     public void setIsValid(int isValid) {
         this.isValid = isValid;
     }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    String userName;
+
 }
diff --git a/src/com/hellogithub/service/oneFileService.java b/src/com/hellogithub/service/oneFileService.java
index 72d64bb..c744c24 100644
--- a/src/com/hellogithub/service/oneFileService.java
+++ b/src/com/hellogithub/service/oneFileService.java
@@ -2,6 +2,7 @@ package com.hellogithub.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.hellogithub.dao.UserDao;
 import com.hellogithub.dao.fileDao;
 import com.hellogithub.entity.fileEntity;
 
@@ -9,6 +10,8 @@ import java.util.*;
 
 public class oneFileService {
     private fileDao fileDao = new fileDao();
+
+    private UserDao userDao = new UserDao();
     public String selectFileEntity(){
 
         List<fileEntity> fileEntityList =fileDao.selectFileEntity();
@@ -31,5 +34,11 @@ public class oneFileService {
         return JSONArray.toJSONString(daMap2);
 
     }
-    public fileEntity selectFileEntityById(int id ){return  fileDao.selectFileEntityById(id); }
+    public fileEntity selectFileEntityById(int id ){
+        int userId = fileDao.selectFileEntityById(id).getUserId();
+        String userName = userDao.selectNameById(userId);
+        fileEntity fileEntity = fileDao.selectFileEntityById(id);
+        fileEntity.setUserName(userName);
+        return  fileEntity;
+    }
 }