From fca96c596f9b3280ed435f9b1ec2b2e612d82e2b Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Wed, 5 Jul 2023 18:35:51 +0800 Subject: [PATCH] organization --- internal/api/router.go | 58 +++++++++++------------ internal/rpc/organization/organization.go | 9 +--- 2 files changed, 29 insertions(+), 38 deletions(-) diff --git a/internal/api/router.go b/internal/api/router.go index f83c541eb..b029da7d5 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -137,44 +137,42 @@ func NewAdminRoute(router gin.IRouter, discov discoveryregistry.SvcDiscoveryRegi initGroup.POST("/get", admin.GetClientConfig) // 获取客户端初始化配置 organizationGroup := router.Group("/organization") - { - //部门 增删改查 - organizationGroup.POST("/create_department", mw.CheckAdmin, org.CreateDepartment) // 创建部门 - organizationGroup.POST("/update_department", mw.CheckAdmin, org.UpdateDepartment) // 修改部门 - organizationGroup.POST("/delete_department", mw.CheckAdmin, org.DeleteDepartment) // 删除部门 - organizationGroup.POST("/get_department", mw.CheckAdmin, org.GetDepartment) // 获取部门 + organizationGroup.GET("/import_template", org.BatchImportTemplate) // 批量导入模板 + organizationGroup.Use(mw.CheckAdmin) + organizationGroup.POST("/import", org.BatchImport) // 批量导入 + //部门 增删改查 + organizationGroup.POST("/create_department", org.CreateDepartment) // 创建部门 + organizationGroup.POST("/update_department", org.UpdateDepartment) // 修改部门 + organizationGroup.POST("/delete_department", org.DeleteDepartment) // 删除部门 + organizationGroup.POST("/get_department", org.GetDepartment) // 获取部门 - //用户 增删改查 - organizationGroup.POST("/create_organization_user", mw.CheckAdmin, org.CreateOrganizationUser) // 创建用户 在某个部门或公司中新增 - organizationGroup.POST("/update_organization_user", mw.CheckAdmin, org.UpdateOrganizationUser) // 修改用户信息 - organizationGroup.POST("/delete_organization_user", mw.CheckAdmin, org.DeleteOrganizationUser) // 删除用户 + //用户 增删改查 + organizationGroup.POST("/create_organization_user", org.CreateOrganizationUser) // 创建用户 在某个部门或公司中新增 + organizationGroup.POST("/update_organization_user", org.UpdateOrganizationUser) // 修改用户信息 + organizationGroup.POST("/delete_organization_user", org.DeleteOrganizationUser) // 删除用户 - //查询用户所在的部门信息以及个人资料 - organizationGroup.POST("/get_user_in_department", mw.CheckToken, org.GetUserInDepartment) // 获取用户所在部门 - organizationGroup.POST("/create_department_member", mw.CheckAdmin, org.CreateDepartmentMember) // 创建部门成员 在某个部门或公司中新增 - organizationGroup.POST("/update_user_in_department", mw.CheckAdmin, org.UpdateUserInDepartment) // 修改用户部门 - //删除 - organizationGroup.POST("/delete_user_in_department", mw.CheckAdmin, org.DeleteUserInDepartment) // 删除部门成员 批量 + //查询用户所在的部门信息以及个人资料 + organizationGroup.POST("/get_user_in_department", mw.CheckToken, org.GetUserInDepartment) // 获取用户所在部门 + organizationGroup.POST("/create_department_member", org.CreateDepartmentMember) // 创建部门成员 在某个部门或公司中新增 + organizationGroup.POST("/update_user_in_department", org.UpdateUserInDepartment) // 修改用户部门 + //删除 + organizationGroup.POST("/delete_user_in_department", org.DeleteUserInDepartment) // 删除部门成员 批量 - organizationGroup.POST("/get_search_user", mw.CheckAdmin, org.GetSearchUserList) // 搜索列表 后端 + organizationGroup.POST("/get_search_user", org.GetSearchUserList) // 搜索列表 后端 - organizationGroup.POST("/set_organization", mw.CheckAdmin, org.SetOrganization) // 设置公司信息 - organizationGroup.POST("/get_organization", mw.CheckToken, org.GetOrganization) // 获取公司信息 - organizationGroup.POST("/move_user_department", mw.CheckAdmin, org.MoveUserDepartment) // 移动用户部门 + organizationGroup.POST("/set_organization", org.SetOrganization) // 设置公司信息 + organizationGroup.POST("/get_organization", mw.CheckToken, org.GetOrganization) // 获取公司信息 + organizationGroup.POST("/move_user_department", org.MoveUserDepartment) // 移动用户部门 - organizationGroup.POST("/get_sub_department", mw.CheckAdmin, org.GetSubDepartment) // 获取部门的人和同级部门 + organizationGroup.POST("/get_sub_department", org.GetSubDepartment) // 获取部门的人和同级部门 - organizationGroup.POST("/get_search_department_user", mw.CheckAdmin, org.GetSearchDepartmentUser) // 搜索部门和用户 + organizationGroup.POST("/get_search_department_user", org.GetSearchDepartmentUser) // 搜索部门和用户 - organizationGroup.POST("/get_organization_department", mw.CheckAdmin, org.GetOrganizationDepartment) // 获取组织部门 - - organizationGroup.POST("/sort_department", mw.CheckAdmin, org.SortDepartmentList) - organizationGroup.POST("/sort_organization_user", mw.CheckAdmin, org.SortOrganizationUserList) + organizationGroup.POST("/get_organization_department", org.GetOrganizationDepartment) // 获取组织部门 - organizationGroup.POST("/create_new_organization_member", mw.CheckAdmin, org.CreateNewOrganizationMember) // 创建用户的同时为其添加部门 + organizationGroup.POST("/sort_department", org.SortDepartmentList) + organizationGroup.POST("/sort_organization_user", org.SortOrganizationUserList) - organizationGroup.POST("/import", mw.CheckAdmin, org.BatchImport) // 批量导入 - organizationGroup.GET("/import_template", org.BatchImportTemplate) // 批量导入模板 - } + organizationGroup.POST("/create_new_organization_member", org.CreateNewOrganizationMember) // 创建用户的同时为其添加部门 } diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go index 8b6e661fa..1d2be70a5 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -899,9 +899,7 @@ func (o *organizationSvr) SortDepartmentList(ctx context.Context, req *organizat } func (o *organizationSvr) SortOrganizationUserList(ctx context.Context, req *organization.SortOrganizationUserListReq) (*organization.SortOrganizationUserListResp, error) { - resp := &organization.SortOrganizationUserListResp{} - // TODO 待实现 - return resp, nil + return nil, errs.ErrInternalServer.Wrap("not implement") } func (o *organizationSvr) CreateNewOrganizationMember(ctx context.Context, req *organization.CreateNewOrganizationMemberReq) (*organization.CreateNewOrganizationMemberResp, error) { @@ -919,11 +917,6 @@ func (o *organizationSvr) CreateNewOrganizationMember(ctx context.Context, req * if len(req.DepartmentMemberList) > 0 { departmentIDList := make([]string, 0, len(req.DepartmentMemberList)) for _, member := range req.DepartmentMemberList { - //if member.Position == "" { - // resp.CommonResp.ErrCode = constant.FormattingError - // resp.CommonResp.ErrMsg = "position is empty" - // return resp, nil - //} departmentIDList = append(departmentIDList, member.DepartmentID) } departments, err := o.Database.GetList(ctx, departmentIDList)