From ce3be0e51a09650b0e18175d82fe27af2097a07f Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 17 Jul 2023 16:09:53 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=96=87=E4=BB=B6=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E4=B8=8A=E4=BC=A0=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oss/controller/OSSFileController.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java b/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java index dcd5bc86..2b5ba144 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.system.vo.LoginUser; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.RequiresRoles; import com.jero.common.api.vo.Result; @@ -27,6 +29,8 @@ public class OSSFileController { @Autowired private IOSSFileService ossFileService; + @Autowired + private ISysBaseAPI sysBaseAPI; @ResponseBody @GetMapping("/page") @@ -87,6 +91,11 @@ public class OSSFileController { result.error500("未找到对应实体"); } else { + String createBy = file.getCreateBy(); + LoginUser loginUser = sysBaseAPI.getUserByName(createBy); + if (loginUser != null){ + file.setCreateBy(loginUser.getRealname()); + } result.setResult(file); result.setSuccess(true); } @@ -103,6 +112,13 @@ public class OSSFileController { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.in(OSSFile::getId ,Arrays.asList(ids.split(","))); List list = ossFileService.list(wrapper); + for (OSSFile file : list) { + String createBy = file.getCreateBy(); + LoginUser loginUser = sysBaseAPI.getUserByName(createBy); + if (loginUser != null){ + file.setCreateBy(loginUser.getRealname()); + } + } return Result.OK(list); }