From f1c313e31050413cce9ee5869c2afa858179ae8b Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 10 九月 2024 12:34:36 +0800 Subject: [PATCH] @# --- zy-acs-flow/src/page/user/UserPanel.jsx | 5 ++--- zy-acs-manager/src/main/resources/mapper/system/UserMapper.xml | 6 +++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/zy-acs-flow/src/page/user/UserPanel.jsx b/zy-acs-flow/src/page/user/UserPanel.jsx index 7c6d708..b3f5fea 100644 --- a/zy-acs-flow/src/page/user/UserPanel.jsx +++ b/zy-acs-flow/src/page/user/UserPanel.jsx @@ -112,13 +112,12 @@ property={record.birthday} /> </Grid> - <Grid item xs={6}> + {/* <Grid item xs={6}> <PanelTypography title="table.field.user.introduction" property={record.introduction} /> - </Grid> - + </Grid> */} </Grid> </CardContent> </Card > diff --git a/zy-acs-manager/src/main/resources/mapper/system/UserMapper.xml b/zy-acs-manager/src/main/resources/mapper/system/UserMapper.xml index 4a6f5cf..6970f2e 100644 --- a/zy-acs-manager/src/main/resources/mapper/system/UserMapper.xml +++ b/zy-acs-manager/src/main/resources/mapper/system/UserMapper.xml @@ -18,7 +18,11 @@ su.* from sys_user su left join sys_dept sd on su.dept_id = sd.id - left join sys_user_role sur on sur.user_id = su.id + left join ( + select * + from sys_user_role sur + group by sur.user_id + ) sur on sur.user_id = su.id where 1=1 and su.deleted = 0 -- Gitblit v1.9.1