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 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; + } }