角色管理修改

@@ -192,7 +192,7 @@ func (authService *AuthService) PhoneAuthCheck(phoneAuthCheckCommand *command.Ph
 	if err := transactionContext.CommitTransaction(); err != nil {
 	if err := transactionContext.CommitTransaction(); err != nil {
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 	}
 	}
-	return struct{}{}, nil
+	return userBase, nil
 }
 }
 
 
 // 重置密码(忘记密码)
 // 重置密码(忘记密码)

@@ -212,3 +212,7 @@ func FastPgAccountDestroyRecord(transactionContext application.TransactionContex
 	}
 	}
 	return rep, mod, err
 	return rep, mod, err
 }
 }
+
+func FastPgDataAuth(transactionContext application.TransactionContext, operateInfo *domain.OperateInfo) error {
+	return nil
+}

@@ -153,7 +153,9 @@ func (orgService *OrgService) GetOrgSubDepartment(getOrgSubDepartmentQuery *quer
 	if err := transactionContext.CommitTransaction(); err != nil {
 	if err := transactionContext.CommitTransaction(); err != nil {
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 	}
 	}
-	return orgs, nil
+	return map[string]interface{}{
+		"orgs": orgs,
+	}, nil
 }
 }
 
 
 // 返回组织列表
 // 返回组织列表

@@ -2,6 +2,7 @@ package command
 
 
 import (
 import (
 	"fmt"
 	"fmt"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/domain"
 	"reflect"
 	"reflect"
 	"strings"
 	"strings"
 
 
@@ -9,6 +10,7 @@ import (
 )
 )
 
 
 type AssginRoleToUsersCommand struct {
 type AssginRoleToUsersCommand struct {
+	OperateInfo *domain.OperateInfo `json:"-"`
 	// 角色ID
 	// 角色ID
 	RoleId int64 `cname:"角色ID" json:"roleId" valid:"Required"`
 	RoleId int64 `cname:"角色ID" json:"roleId" valid:"Required"`
 	// 用户列表
 	// 用户列表

@@ -2,6 +2,7 @@ package command
 
 
 import (
 import (
 	"fmt"
 	"fmt"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/domain"
 	"reflect"
 	"reflect"
 	"strings"
 	"strings"
 
 
@@ -9,6 +10,7 @@ import (
 )
 )
 
 
 type BatchDeleteRoleCommand struct {
 type BatchDeleteRoleCommand struct {
+	OperateInfo *domain.OperateInfo `json:"-"`
 	// 用户ID
 	// 用户ID
 	UserId int64 `cname:"用户ID" json:"userId"`
 	UserId int64 `cname:"用户ID" json:"userId"`
 	// 组织ID
 	// 组织ID

@@ -2,6 +2,7 @@ package command
 
 
 import (
 import (
 	"fmt"
 	"fmt"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/domain"
 	"reflect"
 	"reflect"
 	"strings"
 	"strings"
 
 
@@ -9,10 +10,12 @@ import (
 )
 )
 
 
 type CreateRoleCommand struct {
 type CreateRoleCommand struct {
+	OperateInfo *domain.OperateInfo `json:"-"`
 	// 用户ID
 	// 用户ID
-	UserId int64 `cname:"用户ID" json:"userId" valid:"Required"`
+	UserId int64 `cname:"用户ID" json:"userId"`
 	// 组织ID
 	// 组织ID
-	OrgId int64 `cname:"组织ID" json:"orgId" valid:"Required"`
+	OrgId int64 `cname:"组织ID" json:"orgId"`
+
 	// 角色名称
 	// 角色名称
 	RoleName string `cname:"角色名称" json:"roleName" valid:"Required"`
 	RoleName string `cname:"角色名称" json:"roleName" valid:"Required"`
 	// 描述
 	// 描述
@@ -21,6 +24,9 @@ type CreateRoleCommand struct {
 
 
 func (createRoleCommand *CreateRoleCommand) Valid(validation *validation.Validation) {
 func (createRoleCommand *CreateRoleCommand) Valid(validation *validation.Validation) {
 	//validation.SetError("CustomValid", "未实现的自定义认证")
 	//validation.SetError("CustomValid", "未实现的自定义认证")
+	if !createRoleCommand.OperateInfo.Valid() {
+		validation.SetError("CustomValid", "操作信息不能为空 :"+createRoleCommand.OperateInfo.String())
+	}
 }
 }
 
 
 func (createRoleCommand *CreateRoleCommand) ValidateCommand() error {
 func (createRoleCommand *CreateRoleCommand) ValidateCommand() error {

@@ -2,6 +2,7 @@ package command
 
 
 import (
 import (
 	"fmt"
 	"fmt"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/domain"
 	"reflect"
 	"reflect"
 	"strings"
 	"strings"
 
 
@@ -9,6 +10,7 @@ import (
 )
 )
 
 
 type RemoveRoleCommand struct {
 type RemoveRoleCommand struct {
+	OperateInfo *domain.OperateInfo `json:"-"`
 	// 角色ID
 	// 角色ID
 	RoleId int64 `cname:"角色ID" json:"roleId" valid:"Required"`
 	RoleId int64 `cname:"角色ID" json:"roleId" valid:"Required"`
 }
 }

@@ -2,6 +2,7 @@ package command
 
 
 import (
 import (
 	"fmt"
 	"fmt"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/domain"
 	"reflect"
 	"reflect"
 	"strings"
 	"strings"
 
 
@@ -9,6 +10,7 @@ import (
 )
 )
 
 
 type UnAssginRoleToUsersCommand struct {
 type UnAssginRoleToUsersCommand struct {
+	OperateInfo *domain.OperateInfo `json:"-"`
 	// 角色ID
 	// 角色ID
 	RoleId int64 `cname:"角色ID" json:"roleId" valid:"Required"`
 	RoleId int64 `cname:"角色ID" json:"roleId" valid:"Required"`
 	// 用户列表
 	// 用户列表

@@ -2,6 +2,7 @@ package command
 
 
 import (
 import (
 	"fmt"
 	"fmt"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/domain"
 	"reflect"
 	"reflect"
 	"strings"
 	"strings"
 
 
@@ -9,6 +10,7 @@ import (
 )
 )
 
 
 type UpdateRoleCommand struct {
 type UpdateRoleCommand struct {
+	OperateInfo *domain.OperateInfo `json:"-"`
 	// 角色ID
 	// 角色ID
 	RoleId int64 `cname:"角色ID" json:"roleId,string" valid:"Required"`
 	RoleId int64 `cname:"角色ID" json:"roleId,string" valid:"Required"`
 	// 角色名称
 	// 角色名称

@@ -2,6 +2,7 @@ package command
 
 
 import (
 import (
 	"fmt"
 	"fmt"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/domain"
 	"reflect"
 	"reflect"
 	"strings"
 	"strings"
 
 
@@ -9,6 +10,7 @@ import (
 )
 )
 
 
 type UpdateRoleAccessMenusCommand struct {
 type UpdateRoleAccessMenusCommand struct {
+	OperateInfo *domain.OperateInfo `json:"-"`
 	// 角色ID
 	// 角色ID
 	RoleId int64 `cname:"角色ID" json:"roleId,string" valid:"Required"`
 	RoleId int64 `cname:"角色ID" json:"roleId,string" valid:"Required"`
 	// 菜单编号列表
 	// 菜单编号列表

@@ -25,8 +25,10 @@ func (dto *RoleRelatedUsersDto) LoadDto(users []*domain.User, relatedRoleId int6
 
 
 func newRelatedUsers(user *domain.User) map[string]interface{} {
 func newRelatedUsers(user *domain.User) map[string]interface{} {
 	return map[string]interface{}{
 	return map[string]interface{}{
+		"departmentId":   user.DepartmentId,
 		"departmentName": user.Ext.DepName,
 		"departmentName": user.Ext.DepName,
 		"userId":         user.UserId,
 		"userId":         user.UserId,
 		"userName":       user.Ext.UserName,
 		"userName":       user.Ext.UserName,
+		"userCode":       user.UserCode,
 	}
 	}
 }
 }

@@ -2,6 +2,7 @@ package query
 
 
 import (
 import (
 	"fmt"
 	"fmt"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/domain"
 	"reflect"
 	"reflect"
 	"strings"
 	"strings"
 
 
@@ -9,6 +10,7 @@ import (
 )
 )
 
 
 type GetRoleQuery struct {
 type GetRoleQuery struct {
+	OperateInfo *domain.OperateInfo `json:"-"`
 	// 角色ID
 	// 角色ID
 	RoleId int64 `cname:"角色ID" json:"roleId" valid:"Required"`
 	RoleId int64 `cname:"角色ID" json:"roleId" valid:"Required"`
 }
 }

@@ -2,6 +2,7 @@ package query
 
 
 import (
 import (
 	"fmt"
 	"fmt"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/domain"
 	"reflect"
 	"reflect"
 	"strings"
 	"strings"
 
 
@@ -9,6 +10,7 @@ import (
 )
 )
 
 
 type GetRoleAccessMenusQuery struct {
 type GetRoleAccessMenusQuery struct {
+	OperateInfo *domain.OperateInfo `json:"-"`
 	// 角色ID
 	// 角色ID
 	RoleId int64 `cname:"角色ID" json:"roleId,string" valid:"Required"`
 	RoleId int64 `cname:"角色ID" json:"roleId,string" valid:"Required"`
 }
 }

@@ -2,6 +2,7 @@ package query
 
 
 import (
 import (
 	"fmt"
 	"fmt"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/domain"
 	"reflect"
 	"reflect"
 	"strings"
 	"strings"
 
 
@@ -9,10 +10,12 @@ import (
 )
 )
 
 
 type GetRoleRelatedUsersQuery struct {
 type GetRoleRelatedUsersQuery struct {
-	// 角色ID
-	RoleId int64 `cname:"角色ID" json:"roleId" valid:"Required"`
+	OperateInfo *domain.OperateInfo `json:"-"`
 	// 组织ID
 	// 组织ID
 	OrgId int64 `cname:"组织ID" json:"orgId,string,omitempty"`
 	OrgId int64 `cname:"组织ID" json:"orgId,string,omitempty"`
+
+	// 角色ID
+	RoleId int64 `cname:"角色ID" json:"roleId" valid:"Required"`
 	// 部门编号
 	// 部门编号
 	DepartmentId int64 `cname:"部门编号" json:"departmentId,omitempty"`
 	DepartmentId int64 `cname:"部门编号" json:"departmentId,omitempty"`
 	// 只需要关联的用户 true:仅返回关联用户信息 false:返回所有其他信息（未关联的用户）
 	// 只需要关联的用户 true:仅返回关联用户信息 false:返回所有其他信息（未关联的用户）

@@ -2,6 +2,7 @@ package query
 
 
 import (
 import (
 	"fmt"
 	"fmt"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/domain"
 	"reflect"
 	"reflect"
 	"strings"
 	"strings"
 
 
@@ -9,6 +10,7 @@ import (
 )
 )
 
 
 type ListRoleQuery struct {
 type ListRoleQuery struct {
+	OperateInfo *domain.OperateInfo `json:"-"`
 	// 查询偏离量
 	// 查询偏离量
 	Offset int `cname:"查询偏离量" json:"offset"`
 	Offset int `cname:"查询偏离量" json:"offset"`
 	// 查询限制
 	// 查询限制
@@ -20,7 +22,7 @@ type ListRoleQuery struct {
 	// 组织名称
 	// 组织名称
 	OrgName string `cname:"组织名称" json:"orgName,omitempty"`
 	OrgName string `cname:"组织名称" json:"orgName,omitempty"`
 	// 企业id
 	// 企业id
-	CompanyId int64 `cname:"企业id" json:"companyId" valid:"Required"`
+	CompanyId int64 `cname:"企业id" json:"companyId"`
 	// 组织ID
 	// 组织ID
 	OrgId int64 `cname:"组织ID" json:"orgId,omitempty"`
 	OrgId int64 `cname:"组织ID" json:"orgId,omitempty"`
 	// 匹配多个组织
 	// 匹配多个组织

@@ -32,7 +32,7 @@ func (roleService *RoleService) AssginRoleToUsers(assignRoleToUsersCommand *comm
 	defer func() {
 	defer func() {
 		transactionContext.RollbackTransaction()
 		transactionContext.RollbackTransaction()
 	}()
 	}()
-
+	// TODO:数据权限
 	_, role, err := factory.FastPgRole(transactionContext, assignRoleToUsersCommand.RoleId)
 	_, role, err := factory.FastPgRole(transactionContext, assignRoleToUsersCommand.RoleId)
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err
@@ -74,7 +74,7 @@ func (roleService *RoleService) CreateRole(createRoleCommand *command.CreateRole
 		transactionContext.RollbackTransaction()
 		transactionContext.RollbackTransaction()
 	}()
 	}()
 
 
-	_, org, err := factory.FastPgOrg(transactionContext, createRoleCommand.OrgId)
+	_, org, err := factory.FastPgOrg(transactionContext, createRoleCommand.OperateInfo.GetOrgId(createRoleCommand.OrgId))
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
@@ -183,7 +183,9 @@ func (roleService *RoleService) GetRoleAccessMenus(getRoleAccessMenusQuery *quer
 	if err := transactionContext.CommitTransaction(); err != nil {
 	if err := transactionContext.CommitTransaction(); err != nil {
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 	}
 	}
-	return menus, nil
+	return map[string]interface{}{
+		"menus": menus,
+	}, nil
 }
 }
 
 
 // 获取角色相关联的用户
 // 获取角色相关联的用户
@@ -216,7 +218,7 @@ func (roleService *RoleService) GetRoleRelatedUsers(getRoleRelatedUsersQuery *qu
 	}
 	}
 	queryOptions := make(map[string]interface{})
 	queryOptions := make(map[string]interface{})
 	queryOptions["companyId"] = role.CompanyId
 	queryOptions["companyId"] = role.CompanyId
-	queryOptions["organizationId"] = getRoleRelatedUsersQuery.OrgId
+	queryOptions["organizationId"] = getRoleRelatedUsersQuery.OperateInfo.GetOrgId(getRoleRelatedUsersQuery.OrgId)
 	if getRoleRelatedUsersQuery.DepartmentId > 0 {
 	if getRoleRelatedUsersQuery.DepartmentId > 0 {
 		queryOptions["departmentId"] = getRoleRelatedUsersQuery.DepartmentId
 		queryOptions["departmentId"] = getRoleRelatedUsersQuery.DepartmentId
 	}
 	}
@@ -255,8 +257,10 @@ func (roleService *RoleService) ListRole(listRoleQuery *query.ListRoleQuery) (in
 	} else {
 	} else {
 		roleRepository = value
 		roleRepository = value
 	}
 	}
+
 	queryOptions := utils.ObjectToMap(listRoleQuery)
 	queryOptions := utils.ObjectToMap(listRoleQuery)
 	queryOptions["includeDeleted"] = false
 	queryOptions["includeDeleted"] = false
+	queryOptions["companyId"] = listRoleQuery.OperateInfo.GetCompanyId(listRoleQuery.CompanyId)
 	if count, roles, err := roleRepository.Find(queryOptions); err != nil {
 	if count, roles, err := roleRepository.Find(queryOptions); err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	} else {
 	} else {
@@ -285,6 +289,7 @@ func (roleService *RoleService) RemoveRole(removeRoleCommand *command.RemoveRole
 	defer func() {
 	defer func() {
 		transactionContext.RollbackTransaction()
 		transactionContext.RollbackTransaction()
 	}()
 	}()
+	// TODO:数据权限
 	var roleRepository domain.RoleRepository
 	var roleRepository domain.RoleRepository
 	if value, err := factory.CreateRoleRepository(map[string]interface{}{
 	if value, err := factory.CreateRoleRepository(map[string]interface{}{
 		"transactionContext": transactionContext,
 		"transactionContext": transactionContext,
@@ -329,6 +334,7 @@ func (roleService *RoleService) BatchDeleteRole(removeRoleCommand *command.Batch
 	defer func() {
 	defer func() {
 		transactionContext.RollbackTransaction()
 		transactionContext.RollbackTransaction()
 	}()
 	}()
+	// TODO:数据权限
 	var roleRepository domain.RoleRepository
 	var roleRepository domain.RoleRepository
 	if value, err := factory.CreateRoleRepository(map[string]interface{}{
 	if value, err := factory.CreateRoleRepository(map[string]interface{}{
 		"transactionContext": transactionContext,
 		"transactionContext": transactionContext,
@@ -376,7 +382,7 @@ func (roleService *RoleService) UnAssginRoleToUsers(unAssignRoleToUsersCommand *
 	defer func() {
 	defer func() {
 		transactionContext.RollbackTransaction()
 		transactionContext.RollbackTransaction()
 	}()
 	}()
-
+	// TODO:数据权限
 	_, role, err := factory.FastPgRole(transactionContext, unAssignRoleToUsersCommand.RoleId)
 	_, role, err := factory.FastPgRole(transactionContext, unAssignRoleToUsersCommand.RoleId)
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err
@@ -416,7 +422,7 @@ func (roleService *RoleService) UpdateRole(updateRoleCommand *command.UpdateRole
 	defer func() {
 	defer func() {
 		transactionContext.RollbackTransaction()
 		transactionContext.RollbackTransaction()
 	}()
 	}()
-
+	// TODO:数据权限
 	roleRepository, role, err := factory.FastPgRole(transactionContext, updateRoleCommand.RoleId)
 	roleRepository, role, err := factory.FastPgRole(transactionContext, updateRoleCommand.RoleId)
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err
@@ -456,7 +462,7 @@ func (roleService *RoleService) UpdateRoleAccessMenus(updateRoleAccessMenusComma
 	defer func() {
 	defer func() {
 		transactionContext.RollbackTransaction()
 		transactionContext.RollbackTransaction()
 	}()
 	}()
-
+	// TODO:数据权限
 	roleRepository, role, err := factory.FastPgRole(transactionContext, updateRoleAccessMenusCommand.RoleId)
 	roleRepository, role, err := factory.FastPgRole(transactionContext, updateRoleAccessMenusCommand.RoleId)
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err

@@ -19,6 +19,8 @@ type ListUserQuery struct {
 	OrganizationId int64 `cname:"组织ID" json:"organizationId,omitempty"`
 	OrganizationId int64 `cname:"组织ID" json:"organizationId,omitempty"`
 	// 部门编号
 	// 部门编号
 	DepartmentId int64 `cname:"部门编号" json:"departmentId,omitempty"`
 	DepartmentId int64 `cname:"部门编号" json:"departmentId,omitempty"`
+	// 用户基础ID
+	UserBaseId string `cname:"用户基础ID" json:"userBaseId,omitempty"`
 	// 用户姓名
 	// 用户姓名
 	UserName string `cname:"用户姓名" json:"userName,omitempty"`
 	UserName string `cname:"用户姓名" json:"userName,omitempty"`
 	// 用户姓名
 	// 用户姓名

@@ -446,7 +446,16 @@ func (userService *UserService) ListUser(listUserQuery *query.ListUserQuery) (in
 	}
 	}
 	_, company, _ := factory.FastPgCompany(transactionContext, listUserQuery.CompanyId)
 	_, company, _ := factory.FastPgCompany(transactionContext, listUserQuery.CompanyId)
 	var dtoUsers []*dto.UserDto
 	var dtoUsers []*dto.UserDto
-	if count, users, err := userRepository.Find(utils.ObjectToMap(listUserQuery)); err != nil {
+	queryOptions := utils.ObjectToMap(listUserQuery)
+	if len(listUserQuery.Phone) > 0 {
+		userBaseRepository, _, _ := factory.FastPgUserBase(transactionContext, 0)
+		if userBase, err := userBaseRepository.FindOne(map[string]interface{}{"account": listUserQuery.Phone}); err != nil {
+			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "账号不存在")
+		} else {
+			queryOptions["userBaseId"] = userBase.UserBaseId
+		}
+	}
+	if count, users, err := userRepository.Find(queryOptions); err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	} else {
 	} else {
 		for i := range users {
 		for i := range users {

@@ -10,6 +10,11 @@ var SERVICE_ENV = "dev"
 var CACHE_PREFIX = "allied-creation-user-dev"
 var CACHE_PREFIX = "allied-creation-user-dev"
 var LOG_LEVEL = "debug"
 var LOG_LEVEL = "debug"
 
 
+/*****   1.数据传输  *****/
+const HeaderCompanyId = "companyId"
+const HeaderUserId = "userId"
+const HeaderOrgId = "orgId"
+
 func init() {
 func init() {
 	if os.Getenv("LOG_LEVEL") != "" {
 	if os.Getenv("LOG_LEVEL") != "" {
 		LOG_LEVEL = os.Getenv("LOG_LEVEL")
 		LOG_LEVEL = os.Getenv("LOG_LEVEL")

@@ -9,7 +9,7 @@ var (
 /*****   1.数据权限  *****/
 /*****   1.数据权限  *****/
 // DataAuthor 数据验证器
 // DataAuthor 数据验证器
 type DataAuthor interface {
 type DataAuthor interface {
-	DataAuth(options CheckOptions, data AuthedData) error
+	DataAuth(options OperateInfo, data AuthedData) error
 }
 }
 
 
 // AuthedData 需要认证的数据
 // AuthedData 需要认证的数据
@@ -19,18 +19,52 @@ type AuthedData interface {
 }
 }
 
 
 // 验证参数
 // 验证参数
-type CheckOptions struct {
+type OperateInfo struct {
 	// 当前操作人
 	// 当前操作人
-	OptUser int64
+	UserId int64
+	// 当前公司
+	CompanyId int64
 	// 当前登录的组织
 	// 当前登录的组织
-	Org int64
+	OrgId int64
 	// 菜单模块
 	// 菜单模块
 	MenuCode string
 	MenuCode string
 }
 }
 
 
-func NewCheckOptions(optUser, org int64) CheckOptions {
-	return CheckOptions{
-		OptUser: optUser,
-		Org:     org,
+func NewCheckOptions(optUser, org int64) OperateInfo {
+	return OperateInfo{
+		UserId: optUser,
+		OrgId:  org,
 	}
 	}
 }
 }
+
+func (info OperateInfo) Valid() bool {
+	if info.UserId == 0 || info.CompanyId == 0 || info.OrgId == 0 {
+		return false
+	}
+	return true
+}
+
+func (info OperateInfo) GetCompanyId(companyId int64) int64 {
+	if info.CompanyId == 0 {
+		return companyId
+	}
+	return info.CompanyId
+}
+
+func (info OperateInfo) GetOrgId(orgId int64) int64 {
+	if info.OrgId == 0 {
+		return orgId
+	}
+	return info.OrgId
+}
+
+func (info OperateInfo) GetUserId(userId int64) int64 {
+	if info.UserId == 0 {
+		return userId
+	}
+	return info.UserId
+}
+
+func (info OperateInfo) String() string {
+	return fmt.Sprintf("UserId: %v OrgId:%v CompanyId:%v", info.UserId, info.OrgId, info.CompanyId)
+}

@@ -4,5 +4,5 @@ import "gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/domain"
 
 
 // PgCreateOrgService 创建组织服务
 // PgCreateOrgService 创建组织服务
 type PgCreateOrgService interface {
 type PgCreateOrgService interface {
-	CreateOrg(optUser *domain.CheckOptions, orgInfo *domain.Org) (*domain.Org, error)
+	CreateOrg(optUser *domain.OperateInfo, orgInfo *domain.Org) (*domain.Org, error)
 }
 }

@@ -4,5 +4,5 @@ import "gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/domain"
 
 
 // PgCreateRoleService 传教角色服务
 // PgCreateRoleService 传教角色服务
 type PgCreateRoleService interface {
 type PgCreateRoleService interface {
-	CreateRole(optUser *domain.CheckOptions, roleInfo *domain.Role) (*domain.Role, error)
+	CreateRole(optUser *domain.OperateInfo, roleInfo *domain.Role) (*domain.Role, error)
 }
 }

@@ -4,5 +4,5 @@ import "gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/domain"
 
 
 // 角色有权限的菜单
 // 角色有权限的菜单
 type PgRoleAccessMenusService interface {
 type PgRoleAccessMenusService interface {
-	AccessMenus(options *domain.CheckOptions, roleId []int64, option domain.AccessMenusOptions) ([]*domain.Menu, error)
+	AccessMenus(options *domain.OperateInfo, roleId []int64, option domain.AccessMenusOptions) ([]*domain.Menu, error)
 }
 }

@@ -4,5 +4,5 @@ import "gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/domain"
 
 
 // PgUpdateUserService 用户更新服务
 // PgUpdateUserService 用户更新服务
 type PgUpdateUserService interface {
 type PgUpdateUserService interface {
-	UpdateUser(optUser *domain.CheckOptions, user *domain.User, userInfo *domain.UserInfo, enableStatus int) (*domain.User, error)
+	UpdateUser(optUser *domain.OperateInfo, user *domain.User, userInfo *domain.UserInfo, enableStatus int) (*domain.User, error)
 }
 }

 package domain
 package domain
 
 
+import (
+	"fmt"
+	"strconv"
+)
+
 const (
 const (
 	StructTree = "tree"
 	StructTree = "tree"
 	StructList = "list"
 	StructList = "list"
@@ -105,3 +110,18 @@ func traverse(tree *Tree, node TreeNode) bool {
 	}
 	}
 	return match
 	return match
 }
 }
+
+// Int64String  1 -> "1"  ""
+type Int64String int64
+
+func (t Int64String) MarshalJSON() ([]byte, error) {
+	stamp := fmt.Sprintf(`"%d"`, t)
+	return []byte(stamp), nil
+}
+func (t Int64String) UnMarshalJSON(data []byte) error {
+	v, err := strconv.ParseInt(string(data), 10, 64)
+	t = Int64String(v)
+	return err
+}
+
+type StringInt64 int64

 package domain
 package domain
 
 
 import (
 import (
+	"encoding/json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/assert"
 	"strconv"
 	"strconv"
 	"testing"
 	"testing"
@@ -47,3 +48,20 @@ func (t *st) PID() string {
 func (t *st) ID() string {
 func (t *st) ID() string {
 	return strconv.Itoa(t.Id)
 	return strconv.Itoa(t.Id)
 }
 }
+
+func TestInt64String(t *testing.T) {
+	type value struct {
+		Value Int64String `json:"v"`
+	}
+	jsonData := `{"v":1}`
+	var v = value{}
+	if err := json.Unmarshal([]byte(jsonData), &v); err != nil {
+		assert.Error(t, err)
+	}
+	assert.Equal(t, v.Value, Int64String(1))
+	if data, err := json.Marshal(v); err != nil {
+		assert.Error(t, err)
+	} else {
+		t.Log(string(data))
+	}
+}

@@ -16,7 +16,7 @@ type PgCreateOrgService struct {
 //
 //
 // optUser  操作人
 // optUser  操作人
 // orgInfo   组织信息
 // orgInfo   组织信息
-func (ptr *PgCreateOrgService) CreateOrg(optUser *domain.CheckOptions, orgInfo *domain.Org) (*domain.Org, error) {
+func (ptr *PgCreateOrgService) CreateOrg(optUser *domain.OperateInfo, orgInfo *domain.Org) (*domain.Org, error) {
 	var (
 	var (
 		err error
 		err error
 		org *domain.Org
 		org *domain.Org

@@ -16,7 +16,7 @@ type PgCreateRoleService struct {
 //
 //
 // optUser 操作用户
 // optUser 操作用户
 // roleInfo 角色信息
 // roleInfo 角色信息
-func (ptr *PgCreateRoleService) CreateRole(optUser *domain.CheckOptions, roleInfo *domain.Role) (*domain.Role, error) {
+func (ptr *PgCreateRoleService) CreateRole(optUser *domain.OperateInfo, roleInfo *domain.Role) (*domain.Role, error) {
 	if len(roleInfo.RoleName) == 0 {
 	if len(roleInfo.RoleName) == 0 {
 		return nil, fmt.Errorf("角色名称不能为空")
 		return nil, fmt.Errorf("角色名称不能为空")
 	}
 	}

@@ -16,7 +16,7 @@ type PgDataAuthService struct {
 //
 //
 // options 数据参数
 // options 数据参数
 // data    需要验证权限的数据
 // data    需要验证权限的数据
-func (ptr *PgDataAuthService) DataAuth(options domain.CheckOptions, data domain.AuthedData) error {
+func (ptr *PgDataAuthService) DataAuth(options domain.OperateInfo, data domain.AuthedData) error {
 	return nil
 	return nil
 }
 }
 
 

@@ -19,7 +19,7 @@ type PgRoleAccessMenusService struct {
 //
 //
 // options 数据参数
 // options 数据参数
 // data    需要验证权限的数据
 // data    需要验证权限的数据
-func (ptr *PgRoleAccessMenusService) AccessMenus(options *domain.CheckOptions, roleId []int64, option domain.AccessMenusOptions) ([]*domain.Menu, error) {
+func (ptr *PgRoleAccessMenusService) AccessMenus(options *domain.OperateInfo, roleId []int64, option domain.AccessMenusOptions) ([]*domain.Menu, error) {
 	var err error
 	var err error
 	var menus []*domain.Menu
 	var menus []*domain.Menu
 	menuIdSet := hashset.New()
 	menuIdSet := hashset.New()

@@ -14,7 +14,7 @@ type PgUpdateUserService struct {
 	transactionContext *pgTransaction.TransactionContext
 	transactionContext *pgTransaction.TransactionContext
 }
 }
 
 
-func (ptr *PgUpdateUserService) UpdateUser(optUser *domain.CheckOptions, user *domain.User, userInfo *domain.UserInfo, enableStatus int) (*domain.User, error) {
+func (ptr *PgUpdateUserService) UpdateUser(optUser *domain.OperateInfo, user *domain.User, userInfo *domain.UserInfo, enableStatus int) (*domain.User, error) {
 	var err error
 	var err error
 	roleRepository, _ := repository.NewRoleRepository(ptr.transactionContext)
 	roleRepository, _ := repository.NewRoleRepository(ptr.transactionContext)
 	//1.更新所属组织、部门
 	//1.更新所属组织、部门

@@ -179,6 +179,9 @@ func (repository *RoleRepository) Find(queryOptions map[string]interface{}) (int
 	query.SetWhereByQueryOption("org_id = ?", "orgId")
 	query.SetWhereByQueryOption("org_id = ?", "orgId")
 	query.SetWhereByQueryOption("role_name = ?", "roleName")
 	query.SetWhereByQueryOption("role_name = ?", "roleName")
 	query.SetWhereByQueryOption("(role_type & ?) >0", "roleType")
 	query.SetWhereByQueryOption("(role_type & ?) >0", "roleType")
+	if orgName, ok := queryOptions["orgName"]; ok && len(orgName.(string)) > 0 {
+		query.Where(fmt.Sprintf("ext->>'orgName' like '%%%v%%'", orgName))
+	}
 	// 包含删除的
 	// 包含删除的
 	if v, ok := queryOptions["includeDeleted"]; ok && !(v.(bool)) {
 	if v, ok := queryOptions["includeDeleted"]; ok && !(v.(bool)) {
 		query.Where("deleted_at is null")
 		query.Where("deleted_at is null")

@@ -16,7 +16,7 @@ func init() {
 	web.BConfig.AppName = "project"
 	web.BConfig.AppName = "project"
 	web.BConfig.CopyRequestBody = true
 	web.BConfig.CopyRequestBody = true
 	web.BConfig.RunMode = "dev"
 	web.BConfig.RunMode = "dev"
-	web.BConfig.Listen.HTTPPort = 8080
+	web.BConfig.Listen.HTTPPort = 8081
 	web.BConfig.Listen.EnableAdmin = false
 	web.BConfig.Listen.EnableAdmin = false
 	web.BConfig.WebConfig.CommentRouterPath = "/pkg/port/beego/routers"
 	web.BConfig.WebConfig.CommentRouterPath = "/pkg/port/beego/routers"
 	if os.Getenv("RUN_MODE") != "" {
 	if os.Getenv("RUN_MODE") != "" {

@@ -4,7 +4,10 @@ import (
 	"github.com/beego/beego/v2/server/web/context"
 	"github.com/beego/beego/v2/server/web/context"
 	"github.com/linmadan/egglib-go/web/beego"
 	"github.com/linmadan/egglib-go/web/beego"
 	"github.com/linmadan/egglib-go/web/beego/utils"
 	"github.com/linmadan/egglib-go/web/beego/utils"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/constant"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/log"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-user/pkg/log"
+	"strconv"
 )
 )
 
 
 func ResponseGrid(c beego.BaseController, data interface{}, err error) {
 func ResponseGrid(c beego.BaseController, data interface{}, err error) {
@@ -32,3 +35,24 @@ func Must(err error) {
 		log.Logger.Error(err.Error())
 		log.Logger.Error(err.Error())
 	}
 	}
 }
 }
+
+// ParseOperateInfo  从头部解析操作对象信息
+func ParseOperateInfo(c beego.BaseController) *domain.OperateInfo {
+	opt := &domain.OperateInfo{}
+	opt.UserId = header(c, constant.HeaderUserId)
+	opt.CompanyId = header(c, constant.HeaderCompanyId)
+	opt.OrgId = header(c, constant.HeaderOrgId)
+	return opt
+}
+
+func header(c beego.BaseController, key string) int64 {
+	if len(c.Ctx.Input.Header(key)) == 0 {
+		return 0
+	}
+	res, err := strconv.ParseInt(c.Ctx.Input.Header(key), 10, 64)
+	if err != nil {
+		log.Logger.Error(err.Error())
+		return 0
+	}
+	return res
+}

@@ -15,6 +15,7 @@ func (controller *RoleController) CreateRole() {
 	roleService := service.NewRoleService(nil)
 	roleService := service.NewRoleService(nil)
 	createRoleCommand := &command.CreateRoleCommand{}
 	createRoleCommand := &command.CreateRoleCommand{}
 	Must(controller.Unmarshal(createRoleCommand))
 	Must(controller.Unmarshal(createRoleCommand))
+	createRoleCommand.OperateInfo = ParseOperateInfo(controller.BaseController)
 	data, err := roleService.CreateRole(createRoleCommand)
 	data, err := roleService.CreateRole(createRoleCommand)
 	controller.Response(data, err)
 	controller.Response(data, err)
 }
 }
@@ -25,6 +26,7 @@ func (controller *RoleController) UpdateRole() {
 	controller.Unmarshal(updateRoleCommand)
 	controller.Unmarshal(updateRoleCommand)
 	roleId, _ := controller.GetInt64(":roleId")
 	roleId, _ := controller.GetInt64(":roleId")
 	updateRoleCommand.RoleId = roleId
 	updateRoleCommand.RoleId = roleId
+	updateRoleCommand.OperateInfo = ParseOperateInfo(controller.BaseController)
 	data, err := roleService.UpdateRole(updateRoleCommand)
 	data, err := roleService.UpdateRole(updateRoleCommand)
 	controller.Response(data, err)
 	controller.Response(data, err)
 }
 }
@@ -34,6 +36,7 @@ func (controller *RoleController) GetRole() {
 	getRoleQuery := &query.GetRoleQuery{}
 	getRoleQuery := &query.GetRoleQuery{}
 	roleId, _ := controller.GetInt64(":roleId")
 	roleId, _ := controller.GetInt64(":roleId")
 	getRoleQuery.RoleId = roleId
 	getRoleQuery.RoleId = roleId
+	getRoleQuery.OperateInfo = ParseOperateInfo(controller.BaseController)
 	data, err := roleService.GetRole(getRoleQuery)
 	data, err := roleService.GetRole(getRoleQuery)
 	controller.Response(data, err)
 	controller.Response(data, err)
 }
 }
@@ -44,6 +47,7 @@ func (controller *RoleController) RemoveRole() {
 	controller.Unmarshal(removeRoleCommand)
 	controller.Unmarshal(removeRoleCommand)
 	roleId, _ := controller.GetInt64(":roleId")
 	roleId, _ := controller.GetInt64(":roleId")
 	removeRoleCommand.RoleId = roleId
 	removeRoleCommand.RoleId = roleId
+	removeRoleCommand.OperateInfo = ParseOperateInfo(controller.BaseController)
 	data, err := roleService.RemoveRole(removeRoleCommand)
 	data, err := roleService.RemoveRole(removeRoleCommand)
 	controller.Response(data, err)
 	controller.Response(data, err)
 }
 }
@@ -52,6 +56,7 @@ func (controller *RoleController) BatchDeleteRole() {
 	roleService := service.NewRoleService(nil)
 	roleService := service.NewRoleService(nil)
 	removeRoleCommand := &command.BatchDeleteRoleCommand{}
 	removeRoleCommand := &command.BatchDeleteRoleCommand{}
 	controller.Unmarshal(removeRoleCommand)
 	controller.Unmarshal(removeRoleCommand)
+	removeRoleCommand.OperateInfo = ParseOperateInfo(controller.BaseController)
 	data, err := roleService.BatchDeleteRole(removeRoleCommand)
 	data, err := roleService.BatchDeleteRole(removeRoleCommand)
 	controller.Response(data, err)
 	controller.Response(data, err)
 }
 }
@@ -59,6 +64,7 @@ func (controller *RoleController) BatchDeleteRole() {
 func (controller *RoleController) ListRole() {
 func (controller *RoleController) ListRole() {
 	roleService := service.NewRoleService(nil)
 	roleService := service.NewRoleService(nil)
 	listRoleQuery := &query.ListRoleQuery{}
 	listRoleQuery := &query.ListRoleQuery{}
+	listRoleQuery.OperateInfo = ParseOperateInfo(controller.BaseController)
 	data, err := roleService.ListRole(listRoleQuery)
 	data, err := roleService.ListRole(listRoleQuery)
 	controller.Response(data, err)
 	controller.Response(data, err)
 }
 }
@@ -67,6 +73,7 @@ func (controller *RoleController) SearchRole() {
 	roleService := service.NewRoleService(nil)
 	roleService := service.NewRoleService(nil)
 	listRoleQuery := &query.ListRoleQuery{}
 	listRoleQuery := &query.ListRoleQuery{}
 	Must(controller.Unmarshal(listRoleQuery))
 	Must(controller.Unmarshal(listRoleQuery))
+	listRoleQuery.OperateInfo = ParseOperateInfo(controller.BaseController)
 	data, err := roleService.ListRole(listRoleQuery)
 	data, err := roleService.ListRole(listRoleQuery)
 	controller.Response(data, err)
 	controller.Response(data, err)
 }
 }
@@ -80,6 +87,7 @@ func (controller *RoleController) GetRoleRelatedUsers() {
 	getRoleRelatedUsersQuery.OrgId = orgId
 	getRoleRelatedUsersQuery.OrgId = orgId
 	departmentId, _ := controller.GetInt64("departmentId")
 	departmentId, _ := controller.GetInt64("departmentId")
 	getRoleRelatedUsersQuery.DepartmentId = departmentId
 	getRoleRelatedUsersQuery.DepartmentId = departmentId
+	getRoleRelatedUsersQuery.OperateInfo = ParseOperateInfo(controller.BaseController)
 	data, err := roleService.GetRoleRelatedUsers(getRoleRelatedUsersQuery)
 	data, err := roleService.GetRoleRelatedUsers(getRoleRelatedUsersQuery)
 	controller.Response(data, err)
 	controller.Response(data, err)
 }
 }
@@ -89,6 +97,7 @@ func (controller *RoleController) GetRoleAccessMenus() {
 	getRoleAccessMenusQuery := &query.GetRoleAccessMenusQuery{}
 	getRoleAccessMenusQuery := &query.GetRoleAccessMenusQuery{}
 	roleId, _ := controller.GetInt64(":roleId")
 	roleId, _ := controller.GetInt64(":roleId")
 	getRoleAccessMenusQuery.RoleId = roleId
 	getRoleAccessMenusQuery.RoleId = roleId
+	getRoleAccessMenusQuery.OperateInfo = ParseOperateInfo(controller.BaseController)
 	data, err := roleService.GetRoleAccessMenus(getRoleAccessMenusQuery)
 	data, err := roleService.GetRoleAccessMenus(getRoleAccessMenusQuery)
 	controller.Response(data, err)
 	controller.Response(data, err)
 }
 }
@@ -99,6 +108,7 @@ func (controller *RoleController) UpdateRoleAccessMenus() {
 	controller.Unmarshal(updateRoleAccessMenusCommand)
 	controller.Unmarshal(updateRoleAccessMenusCommand)
 	roleId, _ := controller.GetInt64(":roleId")
 	roleId, _ := controller.GetInt64(":roleId")
 	updateRoleAccessMenusCommand.RoleId = roleId
 	updateRoleAccessMenusCommand.RoleId = roleId
+	updateRoleAccessMenusCommand.OperateInfo = ParseOperateInfo(controller.BaseController)
 	data, err := roleService.UpdateRoleAccessMenus(updateRoleAccessMenusCommand)
 	data, err := roleService.UpdateRoleAccessMenus(updateRoleAccessMenusCommand)
 	controller.Response(data, err)
 	controller.Response(data, err)
 }
 }
@@ -107,6 +117,7 @@ func (controller *RoleController) AssginRoleToUsers() {
 	roleService := service.NewRoleService(nil)
 	roleService := service.NewRoleService(nil)
 	assginRoleToUsersCommand := &command.AssginRoleToUsersCommand{}
 	assginRoleToUsersCommand := &command.AssginRoleToUsersCommand{}
 	controller.Unmarshal(assginRoleToUsersCommand)
 	controller.Unmarshal(assginRoleToUsersCommand)
+	assginRoleToUsersCommand.OperateInfo = ParseOperateInfo(controller.BaseController)
 	data, err := roleService.AssginRoleToUsers(assginRoleToUsersCommand)
 	data, err := roleService.AssginRoleToUsers(assginRoleToUsersCommand)
 	controller.Response(data, err)
 	controller.Response(data, err)
 }
 }
@@ -115,6 +126,7 @@ func (controller *RoleController) UnAssginRoleToUsers() {
 	roleService := service.NewRoleService(nil)
 	roleService := service.NewRoleService(nil)
 	unAssginRoleToUsersCommand := &command.UnAssginRoleToUsersCommand{}
 	unAssginRoleToUsersCommand := &command.UnAssginRoleToUsersCommand{}
 	controller.Unmarshal(unAssginRoleToUsersCommand)
 	controller.Unmarshal(unAssginRoleToUsersCommand)
+	unAssginRoleToUsersCommand.OperateInfo = ParseOperateInfo(controller.BaseController)
 	data, err := roleService.UnAssginRoleToUsers(unAssginRoleToUsersCommand)
 	data, err := roleService.UnAssginRoleToUsers(unAssginRoleToUsersCommand)
 	controller.Response(data, err)
 	controller.Response(data, err)
 }
 }