部分bug修复

app/admin/apis/system/sys_menu/sys_menu.go

@@ -330,9 +330,9 @@ func (e *SysMenu) GetMenuTreeSelect(c *gin.Context) {
 		return
 	}
 
-	d := new(dto.SysMenuSearch)
+	d := new(dto.SelectRole)
 
-	err = d.Bind(c)
+	err = c.BindUri(d)
 	if err != nil {
 		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
 		return
@@ -341,11 +341,22 @@ func (e *SysMenu) GetMenuTreeSelect(c *gin.Context) {
 	serviceSysMenu := service.SysMenu{}
 	serviceSysMenu.Log = log
 	serviceSysMenu.Orm = db
-	result, err := serviceSysMenu.SetSysMenuLabel(d)
-
+	result, err := serviceSysMenu.SetSysMenuLabel()
 	if err != nil {
 		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
 		return
 	}
-	e.OK(c, result, "")
+	s := service.SysRole{}
+	s.Log = log
+	s.Orm = db
+	menuIds, err := s.GetRoleMenuId(db, d.RoleId)
+	if err != nil {
+		log.Errorf("GetIDS error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "")
+		return
+	}
+	e.OK(c, gin.H{
+		"menus":       result,
+		"checkedKeys": menuIds,
+	}, "获取成功")
 }

app/admin/router/sys_config.go

@@ -23,7 +23,7 @@ func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMidd
 		r.DELETE("/:id", api.DeleteSysConfig)
 	}
 
-	r1 := v1.Group("/configKey").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	r1 := v1.Group("/configKey").Use(authMiddleware.MiddlewareFunc())
 	{
 		api := &sys_config.SysConfig{}
 		r1.GET("/:configKey", api.GetSysConfigByKEYForService)

app/admin/router/sys_dept.go

@@ -23,7 +23,7 @@ func registerSysDeptRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle
 		r.DELETE("/:id", api.DeleteSysDept)
 	}
 
-	r1 := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	r1 := v1.Group("").Use(authMiddleware.MiddlewareFunc())
 	{
 		r1.GET("/deptTree", api.GetDeptTree)
 	}

app/admin/router/sys_menu.go

@@ -30,7 +30,7 @@ func registerSysMenuRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle
 		r.DELETE("/:id", api.DeleteSysMenu)
 	}
 
-	r1 := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	r1 := v1.Group("").Use(authMiddleware.MiddlewareFunc())
 	{
 		r1.GET("/menurole", api.GetMenuRole)
 		r1.GET("/menuids", api.GetMenuIDS)

app/admin/router/sys_router.go

@@ -163,7 +163,6 @@ func registerDictRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddlewar
 	dicts := v1.Group("/dict").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
 	{
 
-		dicts.GET("/data-all", dataApi.GetSysDictDataAll)
 		dicts.GET("/data", dataApi.GetSysDictDataList)
 		dicts.GET("/data/:dictCode", dataApi.GetSysDictData)
 		dicts.POST("/data", dataApi.InsertSysDictData)
@@ -177,6 +176,7 @@ func registerDictRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddlewar
 		dicts.PUT("/type/:id", dictApi.UpdateSysDictType)
 		dicts.DELETE("/type", dictApi.DeleteSysDictType)
 	}
+	v1.Group("/dict").Use(authMiddleware.MiddlewareFunc()).GET("/data-all", dataApi.GetSysDictDataAll)
 }
 
 //func registerDeptRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {

app/admin/router/sys_user.go

@@ -30,7 +30,7 @@ func registerSysUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle
 		user.POST("/avatar", api.InsetSysUserAvatar)
 		user.PUT("/pwd", api.SysUserUpdatePwd)
 	}
-	v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc())
 	{
 		v1auth.GET("/getinfo", api.GetInfo)
 	}

app/admin/service/dto/sys_menu.go

@@ -149,3 +149,7 @@ type MenuRole struct {
 	system.SysMenus
 	IsSelect bool `json:"is_select" gorm:"-"`
 }
+
+type SelectRole struct {
+	RoleId int `uri:"roleId"`
+}

app/admin/service/sys_menu.go

@@ -156,9 +156,9 @@ func (e *SysMenu) GetSysMenuList(c *dto.SysMenuSearch, list *[]system.SysMenu) e
 }
 
 // SetSysMenuTree 设置菜单数据
-func (e *SysMenu) SetSysMenuLabel(c *dto.SysMenuSearch) (m []dto.MenuLabel, err error) {
+func (e *SysMenu) SetSysMenuLabel() (m []dto.MenuLabel, err error) {
 	var list []system.SysMenu
-	err = e.GetSysMenuList(c, &list)
+	err = e.GetSysMenuList(&dto.SysMenuSearch{}, &list)
 
 	m = make([]dto.MenuLabel, 0)
 	for i := 0; i < len(list); i++ {

app/admin/service/sys_role.go

@@ -38,10 +38,8 @@ func (e *SysRole) GetSysRolePage(c *dto.SysRoleSearch, list *[]system.SysRole, c
 // GetSysRole 获取SysRole对象
 func (e *SysRole) GetSysRole(d *dto.SysRoleById, model *system.SysRole) error {
 	var err error
-	var data system.SysRole
 
-	db := e.Orm.Model(&data).
-		First(model, d.GetId())
+	db := e.Orm.First(model, d.GetId())
 	err = db.Error
 	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
 		err = errors.New("查看对象不存在或无权查看")
@@ -52,7 +50,7 @@ func (e *SysRole) GetSysRole(d *dto.SysRoleById, model *system.SysRole) error {
 		e.Log.Errorf("db error:%s", err)
 		return err
 	}
-	data.MenuIds, err = e.GetRoleMenuId(e.Orm, data.RoleId)
+	model.MenuIds, err = e.GetRoleMenuId(e.Orm, model.RoleId)
 	if err != nil {
 		e.Log.Errorf("get menuIds error, %s", err.Error())
 		return err