From dc6458b92604314cd6e53dac310840e5e9771120 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 10 Nov 2020 10:04:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lz/modules/app/controller/TestController.java | 2 +- .../com/lz/modules/sys/controller/SysUserController.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/TestController.java b/src/main/java/com/lz/modules/app/controller/TestController.java index f42bbb69..3f55a6ae 100644 --- a/src/main/java/com/lz/modules/app/controller/TestController.java +++ b/src/main/java/com/lz/modules/app/controller/TestController.java @@ -267,7 +267,7 @@ public class TestController { R r = resultRecordService.initFlowRecord(resultRecordId); } - // http://localhost:8080/lz_management/test/getAuth?userId=314 + // http://localhost:8080/lz_management/test/getAuth?userId=395 @RequestMapping("/test/getAuth") public R getAuth(Long userId) throws Exception{ Map map = staffRoleService.getRoleByUserId(userId); diff --git a/src/main/java/com/lz/modules/sys/controller/SysUserController.java b/src/main/java/com/lz/modules/sys/controller/SysUserController.java index 75034d00..71d0e725 100644 --- a/src/main/java/com/lz/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/lz/modules/sys/controller/SysUserController.java @@ -18,6 +18,7 @@ import com.lz.common.validator.ValidatorUtils; import com.lz.common.validator.group.AddGroup; import com.lz.common.validator.group.UpdateGroup; import com.lz.modules.app.entity.UserEntity; +import com.lz.modules.flow.service.StaffRoleService; import com.lz.modules.sys.entity.SysUserEntity; import com.lz.modules.sys.entity.SysUserEntityDto; import com.lz.modules.sys.form.PasswordForm; @@ -45,6 +46,8 @@ public class SysUserController extends AbstractController { private SysUserService sysUserService; @Autowired private SysUserRoleService sysUserRoleService; + @Autowired + private StaffRoleService staffRoleService; /** @@ -72,7 +75,8 @@ public class SysUserController extends AbstractController { SysUserEntity sysUserEntity = getUser(); SysUserEntityDto entityDto = new SysUserEntityDto(); BeanUtils.copyProperties(sysUserEntity, entityDto); - return R.ok().put("user", entityDto); + Map map = staffRoleService.getRoleByUserId(getUserId()); + return R.ok().put("user", entityDto).put("data",map); } /**