fix 修复权限-角色修改，部门按所在部门查询，用户数据权限

api/v1/system/sys_dept.go

@@ -17,6 +17,9 @@ type DeptSearchReq struct {
 	g.Meta     `path:"/dept/list" tags:"系统后台/部门管理" method:"get" summary:"部门列表"`
 	DeptName   string `p:"deptName"`
 	Status     string `p:"status"`
+	ShowAll    bool
+	UserId     uint64
+	UserDeptId uint64
 }
 
 type DeptSearchRes struct {

api/v1/system/sys_user.go

@@ -27,6 +27,7 @@ type UserSearchReq struct {
 	Mobile   string `p:"mobile"`
 	Status   string `p:"status"`
 	KeyWords string `p:"keyWords"`
+	UserInfo *model.ContextUser
 	commonApi.PageReq
 	commonApi.Author
 }

internal/app/system/controller/sys_dept.go

@@ -23,6 +23,8 @@ type sysDeptController struct {
 // List 部门列表
 func (c *sysDeptController) List(ctx context.Context, req *system.DeptSearchReq) (res *system.DeptSearchRes, err error) {
 	res = new(system.DeptSearchRes)
+	req.UserId = service.Context().GetUserId(ctx)
+	req.UserDeptId = service.Context().GetDeptId(ctx)
 	res.DeptList, err = service.SysDept().GetList(ctx, req)
 	return
 }
@@ -50,6 +52,7 @@ func (c *sysDeptController) TreeSelect(ctx context.Context, req *system.DeptTree
 	var deptList []*entity.SysDept
 	deptList, err = service.SysDept().GetList(ctx, &system.DeptSearchReq{
 		Status:  "1", //正常状态数据
+		ShowAll: true,
 	})
 	if err != nil {
 		return

internal/app/system/controller/sys_user.go

@@ -40,6 +40,7 @@ func (c *userController) List(ctx context.Context, req *system.UserSearchReq) (r
 		userList []*entity.SysUser
 	)
 	res = new(system.UserSearchRes)
+	req.UserInfo = service.Context().GetLoginUser(ctx)
 	total, userList, err = service.SysUser().List(ctx, req)
 	if err != nil || total == 0 {
 		return

internal/app/system/logic/sysDept/sys_dept.go

@@ -40,6 +40,22 @@ func (s *sSysDept) GetList(ctx context.Context, req *system.DeptSearchReq) (list
 	if err != nil {
 		return
 	}
+	//判断是否有管理所有部门权限
+	if !req.ShowAll && !service.SysUser().AccessRule(ctx, req.UserId, "api/v1/system/dept/all") {
+		var userDept *entity.SysDept
+		userDept, err = s.GetByDeptId(ctx, req.UserDeptId)
+		if err != nil {
+			return
+		}
+		if userDept == nil {
+			err = errors.New("您没有被设置部门，无法获取信息")
+			return
+		}
+		newList := make([]*entity.SysDept, 0, 100)
+		newList = append(newList, userDept)
+		newList = append(newList, s.FindSonByParentId(list, req.UserDeptId)...)
+		list = newList
+	}
 	rList := make([]*entity.SysDept, 0, len(list))
 	if req.DeptName != "" || req.Status != "" {
 		for _, v := range list {

internal/app/system/logic/sysRole/sys_role.go

@@ -315,6 +315,7 @@ func (s *sSysRole) RoleDeptTreeSelect(ctx context.Context) (res *system.RoleDept
 	err = g.Try(ctx, func(ctx context.Context) {
 		list, err := service.SysDept().GetList(ctx, &system.DeptSearchReq{
 			Status:  "1",
+			ShowAll: true,
 		})
 		liberr.ErrIsNil(ctx, err)
 		dList := service.SysDept().GetListTree(0, list)

internal/app/system/logic/sysUser/sys_user.go

@@ -473,6 +473,15 @@ func (s *sSysUser) List(ctx context.Context, req *system.UserSearchReq) (total i
 			m = m.As("a").LeftJoin("casbin_rule", "b", "b.v0 = CONCAT('u_',a.id )")
 			m = m.Where("v1 = ? and SUBSTR(v0,1,2) = 'u_'", req.RoleId)
 		}
+		//判断权限，普通管理只能按数据权限查看
+		if !s.AccessRule(ctx, req.UserInfo.Id, "api/v1/system/user/all") {
+			m = s.GetAuthDeptWhere(
+				ctx,
+				m,
+				req.UserInfo,
+				"sys_user", "dept_id", "id",
+			).WhereNotIn(dao.SysUser.Columns().Id, s.NotCheckAuthAdminIds(ctx).Slice())
+		}
 		if req.PageSize == 0 {
 			req.PageSize = consts.PageSize
 		}
@@ -605,12 +614,20 @@ func (s *sSysUser) filterRoleIds(ctx context.Context, roleIds []uint, userId uin
 		liberr.ErrIsNil(ctx, err)
 		roleList, err = service.SysRole().GetRoleList(ctx)
 		liberr.ErrIsNil(ctx, err)
+		//子角色也要能够被授权
+		sonIds := make([]uint, 0, 10)
+		for _, v := range accessRoleList {
+			sonIds = append(sonIds, service.SysRole().FindSonIdsByParentId(roleList, v)...)
+		}
+		accessRoleList = append(accessRoleList, sonIds...)
 		//自己创建的角色可以被授权
 		for _, v := range roleList {
 			if v.CreatedBy == userId {
 				accessRoleList = append(accessRoleList, v.Id)
 			}
 		}
+		//去重accessRoleList
+		accessRoleList = gconv.Uints(garray.NewArrayFrom(gconv.Interfaces(accessRoleList)).Unique().Slice())
 		for _, r := range roleIds {
 			for _, a := range accessRoleList {
 				if r == a {

internal/consts/version.go

@@ -9,5 +9,5 @@ package consts
 
 const (
 	Logo    = `CiAgIF9fX19fX19fX19fXyAgICAgICAgICAgX18gCiAgLyBfX19fLyBfX19fL19fXyBfX19fX18vIC9fCiAvIC8gX18vIC9fICAvIF9fIGAvIF9fXy8gX18vCi8gL18vIC8gX18vIC8gL18vIChfXyAgKSAvXyAgClxfX19fL18vICAgIFxfXyxfL19fX18vXF9fLyAg`
-	Version = "3.2.29"
+	Version = "3.2.30"
 )

resource/template/vm/go/logic.template

@@ -440,15 +440,15 @@ func (s *s{{.table.ClassName}})GetBy{{$pkGoField}}(ctx context.Context, {{$.tabl
     err =g.Try(ctx, func(ctx context.Context){
         err = dao.{{.table.ClassName}}.Ctx(ctx).WithAll().Where(dao.{{.table.ClassName}}.Columns().{{$pkGoField}},  {{$.table.PkColumn.HtmlField}}).Scan(&res)
         liberr.ErrIsNil(ctx,err,"获取信息失败")
-        if res!=nil{
         {{if $.table.HasDeptId}}
+        if res!=nil{
         {{if $usedSystemModule}}
             res.DeptInfo = systemService.SysDept().GetByDept(ctx, res.DeptId)
         {{else}}
             res.DeptInfo = service.SysDept().GetByDept(ctx, res.DeptId)
         {{end}}
-        {{end}}
         }
+        {{end}}
         {{range $index, $column := .table.Columns}}
         {{if eq $column.HtmlType "selects" "checkbox" "treeSelects"}}
         {{range $ti, $linkedTable := $.table.LinkedTables}}