From d46e87f784f1b648a6ea138f7bd99b7e78263e5f Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 2 Nov 2023 17:13:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/system/repository/sys_user.impl.go | 11 +++++------
 src/modules/system/system.go                   |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/modules/system/repository/sys_user.impl.go b/src/modules/system/repository/sys_user.impl.go
index 85c957f2..0442150c 100644
--- a/src/modules/system/repository/sys_user.impl.go
+++ b/src/modules/system/repository/sys_user.impl.go
@@ -125,12 +125,11 @@ func (r *SysUserImpl) convertResultRows(rows []map[string]any) []model.SysUser {
 
 // SelectUserPage 根据条件分页查询用户列表
 func (r *SysUserImpl) SelectUserPage(query map[string]any, dataScopeSQL string) map[string]any {
-	selectUserSql := `select 
-    u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader 
-    from sys_user u 
-	left join sys_dept d on u.dept_id = d.dept_id`
 	selectUserTotalSql := `select count(distinct u.user_id) as 'total'
-    from sys_user u left join sys_dept d on u.dept_id = d.dept_id`
+    from sys_user u
+	left join sys_dept d on u.dept_id = d.dept_id
+	left join sys_user_role ur on u.user_id = ur.user_id
+	left join sys_role r on r.role_id = ur.role_id`
 
 	// 查询条件拼接
 	var conditions []string
@@ -208,7 +207,7 @@ func (r *SysUserImpl) SelectUserPage(query map[string]any, dataScopeSQL string)
 	params = append(params, pageSize)
 
 	// 查询数据
-	querySql := selectUserSql + whereSql + dataScopeSQL + pageSql
+	querySql := r.selectSql + whereSql + dataScopeSQL + pageSql
 	results, err := datasource.RawDB("", querySql, params)
 	if err != nil {
 		logger.Errorf("query err => %v", err)
diff --git a/src/modules/system/system.go b/src/modules/system/system.go
index 82cb6a19..1fb9ade9 100644
--- a/src/modules/system/system.go
+++ b/src/modules/system/system.go
@@ -98,7 +98,7 @@ func Setup(router *gin.Engine) {
 			controller.NewSysDept.TreeSelect,
 		)
 		sysDeptGroup.GET("/roleDeptTreeSelect/:roleId",
-			middleware.PreAuthorize(map[string][]string{"hasPerms": {"system:dept:query"}}),
+			middleware.PreAuthorize(map[string][]string{"hasPerms": {"system:dept:query", "system:user:edit"}}),
 			controller.NewSysDept.RoleDeptTreeSelect,
 		)
 	}
@@ -213,7 +213,7 @@ func Setup(router *gin.Engine) {
 			controller.NewSysMenu.TreeSelect,
 		)
 		sysMenuGroup.GET("/roleMenuTreeSelect/:roleId",
-			middleware.PreAuthorize(map[string][]string{"hasPerms": {"system:menu:list"}}),
+			middleware.PreAuthorize(map[string][]string{"hasPerms": {"system:menu:list", "system:role:query"}}),
 			controller.NewSysMenu.RoleMenuTreeSelect,
 		)
 	}

From bd18cdfaca44c6e42d34d6f9a93c64e4f989fa54 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 2 Nov 2023 18:58:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=AD=97=E5=85=B8=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=8F=AA=E9=9C=80=E8=A6=81=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/system/system.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/system/system.go b/src/modules/system/system.go
index 1fb9ade9..24ba57d4 100644
--- a/src/modules/system/system.go
+++ b/src/modules/system/system.go
@@ -130,7 +130,7 @@ func Setup(router *gin.Engine) {
 			controller.NewSysDictData.Remove,
 		)
 		sysDictDataGroup.GET("/type/:dictType",
-			middleware.PreAuthorize(map[string][]string{"hasPerms": {"system:dict:query"}}),
+			middleware.PreAuthorize(nil),
 			controller.NewSysDictData.DictType,
 		)
 		sysDictDataGroup.POST("/export",