新增返回值

api/controller/role.go

@@ -5,6 +5,7 @@ import (
 	"hospital-admin-api/api/dao"
 	"hospital-admin-api/api/requests"
 	"hospital-admin-api/api/responses"
+	"hospital-admin-api/api/responses/roleResponse"
 	"hospital-admin-api/api/service"
 	"hospital-admin-api/global"
 	"hospital-admin-api/utils"
@@ -29,7 +30,7 @@ func (r *Role) GetRoleMenuList(c *gin.Context) {
 		return
 	}
 
-	if len(roleMenuList) == 0 {
+	if len(roleMenuList) == 0 || roleMenuList == nil {
 		responses.FailWithMessage("请联系管理人员设置菜单", c)
 		return
 	}
@@ -67,11 +68,31 @@ func (r *Role) GetRolePage(c *gin.Context) {
 		return
 	}
 
+	// 处理返回值
+	getRolePageResponses := make([]roleResponse.GetRolePage, len(adminRole))
+
+	if len(adminRole) > 0 {
+		for i, v := range adminRole {
+			// 将原始结构体转换为新结构体
+			getRolePageResponse := roleResponse.GetRolePage{
+				RoleId:     strconv.Itoa(int(v.RoleId)),
+				RoleName:   v.RoleName,
+				RoleStatus: v.RoleStatus,
+				IsAdmin:    v.IsAdmin,
+				CreatedAt:  v.CreatedAt,
+				UpdatedAt:  v.UpdatedAt,
+			}
+
+			// 将转换后的结构体添加到新切片中
+			getRolePageResponses[i] = getRolePageResponse
+		}
+	}
+
 	result := make(map[string]interface{})
 	result["page"] = RoleRequest.GetRolePage.Page
 	result["page_size"] = RoleRequest.GetRolePage.PageSize
 	result["total"] = total
-	result["data"] = adminRole
+	result["data"] = getRolePageResponses
 	responses.OkWithData(result, c)
 }
 

api/controller/user.go

@@ -33,6 +33,8 @@ func (r *User) GetUserPage(c *gin.Context) {
 		UserRequest.GetUserPage.PageSize = 20
 	}
 
+	// 获取当前登陆用户数据
+
 	AdminUserDao := dao.AdminUserDao{}
 	adminUser, total, err := AdminUserDao.GetAdminUserPageSearch(UserRequest.GetUserPage, UserRequest.GetUserPage.Page, UserRequest.GetUserPage.PageSize)
 
@@ -48,3 +50,18 @@ func (r *User) GetUserPage(c *gin.Context) {
 	result["data"] = adminUser
 	responses.OkWithData(result, c)
 }
+
+// AddUser 新增用户
+func (r *User) AddUser(c *gin.Context) {
+	UserRequest := requests.UserRequest{}
+	if err := c.ShouldBind(&UserRequest.GetUserPage); err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	// 参数验证
+	if err := global.Validate.Struct(UserRequest.GetUserPage); err != nil {
+		responses.FailWithMessage(utils.Translate(err), c)
+		return
+	}
+}