admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

合并uat到敦煌的冲突解决

Browse Source
This commit is contained in:
guoshengxiong 2025-09-12 16:51:04 +08:00
parent 52ab3f4a38
commit 5a2bcda4a6
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java
View File

@ -1,12 +1,15 @@
package com.zhgd.xmgl.modules.basicdata.controller; package com.zhgd.xmgl.modules.basicdata.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.OperLog; import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; 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.modules.basicdata.service.ISystemUserService;
import com.zhgd.xmgl.util.PageUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@ -123,8 +126,9 @@ public class SystemUserController {
@ApiOperation(value = "通过id查询账号信息", notes = "通过id查询账号信息", httpMethod = "POST") @ApiOperation(value = "通过id查询账号信息", notes = "通过id查询账号信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "账号ID", paramType = "body", required = true, dataType = "Integer") @ApiImplicitParam(name = "id", value = "账号ID", paramType = "body", required = true, dataType = "Integer")
@PostMapping(value = "/queryById") @PostMapping(value = "/queryById")
public Result<SystemUser> queryById(@RequestBody Map<String, Object> map) { public Result<SystemUserVo> queryById(@RequestBody Map<String, Object> map) {
return Result.success(systemUserService.queryById(map)); SystemUser systemUser = systemUserService.queryById(map);
return Result.success(BeanUtil.toBean(systemUser, SystemUserVo.class));
} }
@OperLog(operModul = "账号管理", operType = "修改用户密码", operDesc = "修改用户密码") @OperLog(operModul = "账号管理", operType = "修改用户密码", operDesc = "修改用户密码")
@ -159,8 +163,9 @@ public class SystemUserController {
}) })
@PostMapping(value = "/getSystemUserBySnPage") @PostMapping(value = "/getSystemUserBySnPage")
@PreAuthorize("@perm.hasSnAccess(#map['sn'])") @PreAuthorize("@perm.hasSnAccess(#map['sn'])")
public Result<Page<SystemUser>> getSystemUserBySnPage(@RequestBody Map<String, Object> map) { public Result<Page<SystemUserVo>> getSystemUserBySnPage(@RequestBody Map<String, Object> map) {
return Result.success(systemUserService.getSystemUserBySnPage(map)); Page<SystemUser> page = systemUserService.getSystemUserBySnPage(map);
return Result.success(PageUtil.copyProperties(page, SystemUserVo.class));
} }
@OperLog(operModul = "账号管理", operType = "查找项目子账号列表", operDesc = "查找项目子账号列表") @OperLog(operModul = "账号管理", operType = "查找项目子账号列表", operDesc = "查找项目子账号列表")