yvan/kra-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
yvan
2026-08-15 01:58:41 +08:00
parent e55fb57432
commit 1a5969897a
32 changed files with 687 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/server/handler/organization.go
+22 -19
View File
@@ -10,16 +10,19 @@ import (
"github.com/gin-gonic/gin"
)
type Organization struct{ service *service.OrganizationService }
type Organization struct {
departments *service.DepartmentService
positions *service.PositionService
}
func NewOrganization(service *service.OrganizationService) *Organization {
return &Organization{service: service}
func NewOrganization(departments *service.DepartmentService, positions *service.PositionService) *Organization {
return &Organization{departments: departments, positions: positions}
}
func (h *Organization) ListDepartments(c *gin.Context) {
var req dto.DepartmentListRequest
_ = c.ShouldBindJSON(&req)
items, err := h.service.Departments(c.Request.Context(), req.Name)
items, err := h.departments.Departments(c.Request.Context(), req.Name)
if err != nil {
httpx.Fail(c, "获取失败")
return
@@ -36,7 +39,7 @@ func (h *Organization) CreateDepartment(c *gin.Context) {
httpx.Fail(c, "部门名称不能为空")
return
}
if err := h.service.CreateDepartment(c.Request.Context(), &req); err != nil {
if err := h.departments.Create(c.Request.Context(), &req); err != nil {
httpx.Fail(c, "创建失败:"+err.Error())
return
}
@@ -52,7 +55,7 @@ func (h *Organization) UpdateDepartment(c *gin.Context) {
httpx.Fail(c, "部门ID不能为空")
return
}
if err := h.service.UpdateDepartment(c.Request.Context(), &req); err != nil {
if err := h.departments.Update(c.Request.Context(), &req); err != nil {
httpx.Fail(c, "更新失败:"+err.Error())
return
}
@@ -64,7 +67,7 @@ func (h *Organization) DeleteDepartment(c *gin.Context) {
httpx.Fail(c, "参数错误")
return
}
if err := h.service.DeleteDepartment(c.Request.Context(), req.ID); err != nil {
if err := h.departments.Delete(c.Request.Context(), req.ID); err != nil {
httpx.Fail(c, err.Error())
return
}
@@ -72,7 +75,7 @@ func (h *Organization) DeleteDepartment(c *gin.Context) {
}
func (h *Organization) FindDepartment(c *gin.Context) {
id, _ := strconv.ParseUint(c.Query("id"), 10, 64)
item, err := h.service.Department(c.Request.Context(), uint(id))
item, err := h.departments.Department(c.Request.Context(), uint(id))
if err != nil {
httpx.Fail(c, "获取失败:"+err.Error())
return
@@ -81,7 +84,7 @@ func (h *Organization) FindDepartment(c *gin.Context) {
}
func (h *Organization) DepartmentUsers(c *gin.Context) {
id, _ := strconv.ParseUint(c.Query("deptId"), 10, 64)
ids, err := h.service.DepartmentUserIDs(c.Request.Context(), uint(id))
ids, err := h.departments.UserIDs(c.Request.Context(), uint(id))
if err != nil {
httpx.Fail(c, "获取失败:"+err.Error())
return
@@ -97,7 +100,7 @@ func (h *Organization) SetDepartmentUsers(c *gin.Context) {
httpx.Fail(c, "参数错误")
return
}
if err := h.service.SetDepartmentUsers(c.Request.Context(), &req); err != nil {
if err := h.departments.SetUsers(c.Request.Context(), &req); err != nil {
httpx.Fail(c, "设置失败:"+err.Error())
return
}
@@ -109,7 +112,7 @@ func (h *Organization) SetUserDepartments(c *gin.Context) {
httpx.Fail(c, "参数错误")
return
}
if err := h.service.SetUserDepartments(c.Request.Context(), &req); err != nil {
if err := h.departments.SetUserDepartments(c.Request.Context(), &req); err != nil {
httpx.Fail(c, "设置失败")
return
}
@@ -122,7 +125,7 @@ func (h *Organization) ListPositions(c *gin.Context) {
httpx.Fail(c, "参数错误")
return
}
items, total, err := h.service.Positions(c.Request.Context(), &req)
items, total, err := h.positions.Positions(c.Request.Context(), &req)
if err != nil {
httpx.Fail(c, "获取失败")
return
@@ -139,7 +142,7 @@ func (h *Organization) CreatePosition(c *gin.Context) {
httpx.Fail(c, "岗位名称不能为空")
return
}
if err := h.service.CreatePosition(c.Request.Context(), &req); err != nil {
if err := h.positions.Create(c.Request.Context(), &req); err != nil {
httpx.Fail(c, "创建失败:"+err.Error())
return
}
@@ -155,7 +158,7 @@ func (h *Organization) UpdatePosition(c *gin.Context) {
httpx.Fail(c, "岗位ID不能为空")
return
}
if err := h.service.UpdatePosition(c.Request.Context(), &req); err != nil {
if err := h.positions.Update(c.Request.Context(), &req); err != nil {
httpx.Fail(c, "更新失败:"+err.Error())
return
}
@@ -167,7 +170,7 @@ func (h *Organization) DeletePosition(c *gin.Context) {
httpx.Fail(c, "参数错误")
return
}
if err := h.service.DeletePosition(c.Request.Context(), req.ID); err != nil {
if err := h.positions.Delete(c.Request.Context(), req.ID); err != nil {
httpx.Fail(c, "删除失败:"+err.Error())
return
}
@@ -175,7 +178,7 @@ func (h *Organization) DeletePosition(c *gin.Context) {
}
func (h *Organization) FindPosition(c *gin.Context) {
id, _ := strconv.ParseUint(c.Query("id"), 10, 64)
item, err := h.service.Position(c.Request.Context(), uint(id))
item, err := h.positions.Position(c.Request.Context(), uint(id))
if err != nil {
httpx.Fail(c, "获取失败:"+err.Error())
return
@@ -184,7 +187,7 @@ func (h *Organization) FindPosition(c *gin.Context) {
}
func (h *Organization) PositionUsers(c *gin.Context) {
id, _ := strconv.ParseUint(c.Query("positionId"), 10, 64)
ids, err := h.service.PositionUserIDs(c.Request.Context(), uint(id))
ids, err := h.positions.UserIDs(c.Request.Context(), uint(id))
if err != nil {
httpx.Fail(c, "获取失败:"+err.Error())
return
@@ -200,7 +203,7 @@ func (h *Organization) SetPositionUsers(c *gin.Context) {
httpx.Fail(c, "参数错误")
return
}
if err := h.service.SetPositionUsers(c.Request.Context(), &req); err != nil {
if err := h.positions.SetUsers(c.Request.Context(), &req); err != nil {
httpx.Fail(c, "设置失败:"+err.Error())
return
}
@@ -212,7 +215,7 @@ func (h *Organization) SetUserPositions(c *gin.Context) {
httpx.Fail(c, "参数错误")
return
}
if err := h.service.SetUserPositions(c.Request.Context(), &req); err != nil {
if err := h.positions.SetUserPositions(c.Request.Context(), &req); err != nil {
httpx.Fail(c, "设置失败")
return
}