新增角色列表，岗位列表

api/controller/post.go

@@ -207,3 +207,40 @@ func (r *Post) PutPost(c *gin.Context) {
 	}
 	responses.Ok(c)
 }
+
+// GetPostList 获取岗位列表
+func (r *Post) GetPostList(c *gin.Context) {
+	roleRequest := requests.PostRequest{}
+	if err := c.ShouldBind(&roleRequest.GetPostList); err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	// 参数验证
+	if err := global.Validate.Struct(roleRequest.GetPostList); err != nil {
+		responses.FailWithMessage(utils.Translate(err), c)
+		return
+	}
+
+	adminPostDao := dao.AdminPostDao{}
+
+	maps := make(map[string]interface{})
+	if roleRequest.GetPostList.PostName != "" {
+		maps["post_name"] = roleRequest.GetPostList.PostName
+	}
+	adminPosts, err := adminPostDao.GetAdminPostList(maps)
+	if err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	if len(adminPosts) == 0 {
+		responses.Ok(c)
+		return
+	}
+
+	// 处理返回值
+	getPostListResponses := postResponse.GetPostListResponse(adminPosts)
+
+	responses.OkWithData(getPostListResponses, c)
+}

api/controller/role.go

@@ -222,14 +222,14 @@ func (r *Role) GetRole(c *gin.Context) {
 
 // PutRole 修改角色
 func (r *Role) PutRole(c *gin.Context) {
-	RoleRequest := requests.RoleRequest{}
-	if err := c.ShouldBindJSON(&RoleRequest.PutRole); err != nil {
+	roleRequest := requests.RoleRequest{}
+	if err := c.ShouldBindJSON(&roleRequest.PutRole); err != nil {
 		responses.FailWithMessage(err.Error(), c)
 		return
 	}
 
 	// 参数验证
-	if err := global.Validate.Struct(RoleRequest.PutRole); err != nil {
+	if err := global.Validate.Struct(roleRequest.PutRole); err != nil {
 		responses.FailWithMessage(utils.Translate(err), c)
 		return
 	}
@@ -248,7 +248,7 @@ func (r *Role) PutRole(c *gin.Context) {
 	}
 
 	// 判断菜单数据是否为空
-	if len(RoleRequest.PutRole.MenuIds) == 0 {
+	if len(roleRequest.PutRole.MenuIds) == 0 {
 		responses.FailWithMessage("请为角色添加菜单", c)
 		return
 	}
@@ -267,8 +267,7 @@ func (r *Role) PutRole(c *gin.Context) {
 	}
 
 	// 业务处理
-	RoleService := service.RoleService{}
-	_, err = RoleService.PutRole(c, roleId, RoleRequest.PutRole)
+	_, err = roleService.PutRole(c, roleId, roleRequest.PutRole)
 	if err != nil {
 		responses.FailWithMessage(err.Error(), c)
 		return
@@ -278,24 +277,61 @@ func (r *Role) PutRole(c *gin.Context) {
 
 // DeleteRole 删除角色-批量
 func (r *Role) DeleteRole(c *gin.Context) {
-	RoleRequest := requests.RoleRequest{}
-	if err := c.ShouldBindJSON(&RoleRequest.DeleteRole); err != nil {
+	roleRequest := requests.RoleRequest{}
+	if err := c.ShouldBindJSON(&roleRequest.DeleteRole); err != nil {
 		responses.FailWithMessage(err.Error(), c)
 		return
 	}
 
 	// 参数验证
-	if err := global.Validate.Struct(RoleRequest.DeleteRole); err != nil {
+	if err := global.Validate.Struct(roleRequest.DeleteRole); err != nil {
 		responses.FailWithMessage(utils.Translate(err), c)
 		return
 	}
 
 	// 业务处理
-	RoleService := service.RoleService{}
-	_, err := RoleService.DeleteRole(c, RoleRequest.DeleteRole)
+	roleService := service.RoleService{}
+	_, err := roleService.DeleteRole(c, roleRequest.DeleteRole)
 	if err != nil {
 		responses.FailWithMessage(err.Error(), c)
 		return
 	}
 	responses.Ok(c)
 }
+
+// GetRoleList 获取角色列表
+func (r *Role) GetRoleList(c *gin.Context) {
+	roleRequest := requests.RoleRequest{}
+	if err := c.ShouldBind(&roleRequest.GetRoleList); err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	// 参数验证
+	if err := global.Validate.Struct(roleRequest.GetRoleList); err != nil {
+		responses.FailWithMessage(utils.Translate(err), c)
+		return
+	}
+
+	adminRoleDao := dao.AdminRoleDao{}
+
+	maps := make(map[string]interface{})
+	if roleRequest.GetRoleList.RoleName != "" {
+		maps["role_name"] = roleRequest.GetRoleList.RoleName
+	}
+	adminRoles, err := adminRoleDao.GetAdminRoleList(maps)
+	if err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	if len(adminRoles) == 0 {
+		responses.Ok(c)
+		return
+	}
+
+	// 处理返回值
+	getRoleListResponses := roleResponse.GetRoleListResponse(adminRoles)
+
+	responses.OkWithData(getRoleListResponses, c)
+}