优化

2026-08-16 01:19:10 +08:00
parent c4b114762b
commit c554152f4f
43 changed files with 1311 additions and 318 deletions
@@ -1,8 +1,6 @@
 package handler

 import (
-	"strconv"
-
 	"kra/internal/server/httpx"
 	"kra/internal/service"
 	"kra/internal/service/dto"
@@ -24,7 +22,7 @@ func (h *Organization) ListDepartments(c *gin.Context) {
 	_ = c.ShouldBindJSON(&req)
 	items, err := h.departments.Departments(c.Request.Context(), req.Name)
 	if err != nil {
-		httpx.Fail(c, "获取失败")
+		httpx.Fail(c, "获取失败:"+err.Error())
 		return
 	}
 	httpx.Write(c, httpx.CodeSuccess, items, "获取成功")
@@ -63,19 +61,23 @@ func (h *Organization) UpdateDepartment(c *gin.Context) {
 }
 func (h *Organization) DeleteDepartment(c *gin.Context) {
 	var req dto.DeleteDepartmentRequest
-	if c.ShouldBindJSON(&req) != nil {
-		httpx.Fail(c, "参数错误")
+	if err := c.ShouldBindJSON(&req); err != nil {
+		httpx.Fail(c, err.Error())
 		return
 	}
 	if err := h.departments.Delete(c.Request.Context(), req.ID); err != nil {
-		httpx.Fail(c, err.Error())
+		httpx.Fail(c, "删除失败:"+err.Error())
 		return
 	}
 	httpx.Write(c, httpx.CodeSuccess, nil, "删除成功")
 }
 func (h *Organization) FindDepartment(c *gin.Context) {
-	id, _ := strconv.ParseUint(c.Query("id"), 10, 64)
-	item, err := h.departments.Department(c.Request.Context(), uint(id))
+	var req dto.DeleteDepartmentRequest
+	if err := c.ShouldBindQuery(&req); err != nil {
+		httpx.Fail(c, err.Error())
+		return
+	}
+	item, err := h.departments.Department(c.Request.Context(), req.ID)
 	if err != nil {
 		httpx.Fail(c, "获取失败:"+err.Error())
 		return
@@ -83,8 +85,12 @@ func (h *Organization) FindDepartment(c *gin.Context) {
 	httpx.Write(c, httpx.CodeSuccess, item, "获取成功")
 }
 func (h *Organization) DepartmentUsers(c *gin.Context) {
-	id, _ := strconv.ParseUint(c.Query("deptId"), 10, 64)
-	ids, err := h.departments.UserIDs(c.Request.Context(), uint(id))
+	var req dto.SetDepartmentUsersRequest
+	if err := c.ShouldBindQuery(&req); err != nil {
+		httpx.Fail(c, err.Error())
+		return
+	}
+	ids, err := h.departments.UserIDs(c.Request.Context(), req.DepartmentID)
 	if err != nil {
 		httpx.Fail(c, "获取失败:"+err.Error())
 		return
@@ -96,8 +102,12 @@ func (h *Organization) DepartmentUsers(c *gin.Context) {
 }
 func (h *Organization) SetDepartmentUsers(c *gin.Context) {
 	var req dto.SetDepartmentUsersRequest
-	if c.ShouldBindJSON(&req) != nil {
-		httpx.Fail(c, "参数错误")
+	if err := c.ShouldBindJSON(&req); err != nil {
+		httpx.Fail(c, err.Error())
+		return
+	}
+	if req.DepartmentID == 0 {
+		httpx.Fail(c, "部门ID不能为空")
 		return
 	}
 	if err := h.departments.SetUsers(c.Request.Context(), &req); err != nil {
@@ -108,8 +118,8 @@ func (h *Organization) SetDepartmentUsers(c *gin.Context) {
 }
 func (h *Organization) SetUserDepartments(c *gin.Context) {
 	var req dto.SetUserDepartmentsRequest
-	if c.ShouldBindJSON(&req) != nil {
-		httpx.Fail(c, "参数错误")
+	if err := c.ShouldBindJSON(&req); err != nil {
+		httpx.Fail(c, err.Error())
 		return
 	}
 	if err := h.departments.SetUserDepartments(c.Request.Context(), &req); err != nil {
@@ -121,13 +131,13 @@ func (h *Organization) SetUserDepartments(c *gin.Context) {

 func (h *Organization) ListPositions(c *gin.Context) {
 	var req dto.PositionListRequest
-	if c.ShouldBindJSON(&req) != nil {
-		httpx.Fail(c, "参数错误")
+	if err := c.ShouldBindJSON(&req); err != nil {
+		httpx.Fail(c, err.Error())
 		return
 	}
 	items, total, err := h.positions.Positions(c.Request.Context(), &req)
 	if err != nil {
-		httpx.Fail(c, "获取失败")
+		httpx.Fail(c, "获取失败:"+err.Error())
 		return
 	}
 	httpx.Write(c, httpx.CodeSuccess, httpx.PageResult{List: items, Total: total, Page: req.Page, PageSize: req.PageSize}, "获取成功")
@@ -166,8 +176,8 @@ func (h *Organization) UpdatePosition(c *gin.Context) {
 }
 func (h *Organization) DeletePosition(c *gin.Context) {
 	var req dto.DeletePositionRequest
-	if c.ShouldBindJSON(&req) != nil {
-		httpx.Fail(c, "参数错误")
+	if err := c.ShouldBindJSON(&req); err != nil {
+		httpx.Fail(c, err.Error())
 		return
 	}
 	if err := h.positions.Delete(c.Request.Context(), req.ID); err != nil {
@@ -177,8 +187,12 @@ func (h *Organization) DeletePosition(c *gin.Context) {
 	httpx.Write(c, httpx.CodeSuccess, nil, "删除成功")
 }
 func (h *Organization) FindPosition(c *gin.Context) {
-	id, _ := strconv.ParseUint(c.Query("id"), 10, 64)
-	item, err := h.positions.Position(c.Request.Context(), uint(id))
+	var req dto.DeletePositionRequest
+	if err := c.ShouldBindQuery(&req); err != nil {
+		httpx.Fail(c, err.Error())
+		return
+	}
+	item, err := h.positions.Position(c.Request.Context(), req.ID)
 	if err != nil {
 		httpx.Fail(c, "获取失败:"+err.Error())
 		return
@@ -186,8 +200,12 @@ func (h *Organization) FindPosition(c *gin.Context) {
 	httpx.Write(c, httpx.CodeSuccess, item, "获取成功")
 }
 func (h *Organization) PositionUsers(c *gin.Context) {
-	id, _ := strconv.ParseUint(c.Query("positionId"), 10, 64)
-	ids, err := h.positions.UserIDs(c.Request.Context(), uint(id))
+	var req dto.SetPositionUsersRequest
+	if err := c.ShouldBindQuery(&req); err != nil {
+		httpx.Fail(c, err.Error())
+		return
+	}
+	ids, err := h.positions.UserIDs(c.Request.Context(), req.PositionID)
 	if err != nil {
 		httpx.Fail(c, "获取失败:"+err.Error())
 		return
@@ -199,8 +217,12 @@ func (h *Organization) PositionUsers(c *gin.Context) {
 }
 func (h *Organization) SetPositionUsers(c *gin.Context) {
 	var req dto.SetPositionUsersRequest
-	if c.ShouldBindJSON(&req) != nil {
-		httpx.Fail(c, "参数错误")
+	if err := c.ShouldBindJSON(&req); err != nil {
+		httpx.Fail(c, err.Error())
+		return
+	}
+	if req.PositionID == 0 {
+		httpx.Fail(c, "岗位ID不能为空")
 		return
 	}
 	if err := h.positions.SetUsers(c.Request.Context(), &req); err != nil {
@@ -211,8 +233,8 @@ func (h *Organization) SetPositionUsers(c *gin.Context) {
 }
 func (h *Organization) SetUserPositions(c *gin.Context) {
 	var req dto.SetUserPositionsRequest
-	if c.ShouldBindJSON(&req) != nil {
-		httpx.Fail(c, "参数错误")
+	if err := c.ShouldBindJSON(&req); err != nil {
+		httpx.Fail(c, err.Error())
 		return
 	}
 	if err := h.positions.SetUserPositions(c.Request.Context(), &req); err != nil {