From 5a2bcda4a6a77c6518c4f310f674786aa5ff07f5 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Fri, 12 Sep 2025 16:51:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6uat=E5=88=B0=E6=95=A6?= =?UTF-8?q?=E7=85=8C=E7=9A=84=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/controller/SystemUserController.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java index 47e82716c..456299ae2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java @@ -1,12 +1,15 @@ package com.zhgd.xmgl.modules.basicdata.controller; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; +import com.zhgd.xmgl.modules.basicdata.entity.vo.SystemUserVo; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; +import com.zhgd.xmgl.util.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -123,8 +126,9 @@ public class SystemUserController { @ApiOperation(value = "通过id查询账号信息", notes = "通过id查询账号信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "账号ID", paramType = "body", required = true, dataType = "Integer") @PostMapping(value = "/queryById") - public Result queryById(@RequestBody Map map) { - return Result.success(systemUserService.queryById(map)); + public Result queryById(@RequestBody Map map) { + SystemUser systemUser = systemUserService.queryById(map); + return Result.success(BeanUtil.toBean(systemUser, SystemUserVo.class)); } @OperLog(operModul = "账号管理", operType = "修改用户密码", operDesc = "修改用户密码") @@ -159,8 +163,9 @@ public class SystemUserController { }) @PostMapping(value = "/getSystemUserBySnPage") @PreAuthorize("@perm.hasSnAccess(#map['sn'])") - public Result> getSystemUserBySnPage(@RequestBody Map map) { - return Result.success(systemUserService.getSystemUserBySnPage(map)); + public Result> getSystemUserBySnPage(@RequestBody Map map) { + Page page = systemUserService.getSystemUserBySnPage(map); + return Result.success(PageUtil.copyProperties(page, SystemUserVo.class)); } @OperLog(operModul = "账号管理", operType = "查找项目子账号列表", operDesc = "查找项目子账号列表")