gfwleak/appsketch-works-asw-controller
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: workspace&suer接口返回 用户 userName 信息

Browse Source
This commit is contained in:
zhangshuai
2024-09-06 10:13:07 +08:00
parent ac391799de
commit d1f0ec1a58
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/geedge/asw/module/workspace/controller/WorkspaceController.java
View File

@@ -39,10 +39,12 @@ public class WorkspaceController {
String updateUserId = workspace.getUpdateUserId();
if (T.StrUtil.isNotEmpty(createUserId)) {
SysUserEntity createUser = userService.getById(createUserId);
createUser.setPwd(null);
workspace.setCreateUser(createUser);
}
if (T.StrUtil.isNotEmpty(updateUserId)) {
SysUserEntity updateUser = userService.getById(updateUserId);
updateUser.setPwd(null);
workspace.setUpdateUser(updateUser);
}
return R.ok().putData("record", workspace);

6
src/main/resources/db/mapper/sys/SysUserMapper.xml
View File

@@ -18,11 +18,13 @@
<association property="createUser" columnPrefix="cu_" javaType="net.geedge.asw.module.sys.entity.SysUserEntity">
<id property="id" column="id"/>
<result property="name" column="name"/>
<result property="userName" column="user_name"/>
</association>
<association property="updateUser" columnPrefix="uu_" javaType="net.geedge.asw.module.sys.entity.SysUserEntity">
<id property="id" column="id"/>
<result property="name" column="name"/>
<result property="userName" column="user_name"/>
</association>
</resultMap>
@@ -31,8 +33,10 @@
su.*,
cu.id as cu_id,
cu.name as cu_name,
cu.user_name as cu_user_name,
uu.id as uu_id,
uu.id as uu_name
uu.name as uu_name,
uu.user_name as uu_user_name
FROM
sys_user su
left join sys_user cu on su.create_user_id = cu.id

6
src/main/resources/db/mapper/workspace/WorkspaceMapper.xml
View File

@@ -17,11 +17,13 @@
<association property="createUser" columnPrefix="cu_" javaType="net.geedge.asw.module.sys.entity.SysUserEntity">
<id property="id" column="id"/>
<result property="name" column="name"/>
<result property="userName" column="user_name"/>
</association>
<association property="updateUser" columnPrefix="uu_" javaType="net.geedge.asw.module.sys.entity.SysUserEntity">
<id property="id" column="id"/>
<result property="name" column="name"/>
<result property="userName" column="user_name"/>
</association>
</resultMap>
@@ -30,8 +32,10 @@
ws.*,
cu.id AS cu_id,
cu.name AS cu_name,
cu.user_name AS cu_user_name,
uu.id AS uu_id,
uu.name AS uu_name
uu.name AS uu_name,
uu.user_name AS uu_user_name
FROM
workspace ws
LEFT JOIN sys_user cu ON ws.create_user_id = cu.id