1

dao/project_dao.go

@@ -53,7 +53,7 @@ func (d *ProjectDao) GetPage(page int, size int) []models.CmProject {
 	return datalist
 }
 
-func (d *ProjectDao) GetPageBs(pageData viewmodels.ProjectPage, InsideCategoryId int) (data []models.CmProject, total int64) {
+func (d *ProjectDao) GetPageBs(pageData viewmodels.ProjectPage) (data []models.CmProject, total int64) {
 	datalist := make([]models.CmProject, 0)
 	page := pageData.Page
 	size := pageData.Size
@@ -66,7 +66,12 @@ func (d *ProjectDao) GetPageBs(pageData viewmodels.ProjectPage, InsideCategoryId
 
 	Project := &models.CmProject{}
 
-	if InsideCategoryId != 0 && pageData.Search != "" {
+	InsideCategoryId := ""
+	if len(pageData.InsideCategoryId) > 0 {
+		InsideCategoryId = pageData.InsideCategoryId[0]
+	}
+
+	if InsideCategoryId != "" && pageData.Search != "" {
 		count, _ := d.engine.
 			Where("insideCategoryId= ? and (code like ? or  name like ?) ", InsideCategoryId, pageData.Search, pageData.Search).
 			Count(Project)
@@ -77,7 +82,7 @@ func (d *ProjectDao) GetPageBs(pageData viewmodels.ProjectPage, InsideCategoryId
 		return datalist, count
 	}
 
-	if InsideCategoryId != 0 {
+	if InsideCategoryId != "" {
 		count, _ := d.engine.
 			Where("insideCategoryId= ?", InsideCategoryId).
 			Count(Project)

services/project_service.go

@@ -35,7 +35,7 @@ type ProjectService interface {
 	Save(projectId int, projectVM viewmodels.Project) error
 	Add(projectVM viewmodels.Project) error
 	SaveBs(projectVM viewmodels.Project, id int) error
-	GetListBs(pageData viewmodels.ProjectPage, InsideCategoryId int) (data []viewmodels.Project, total int64)
+	GetListBs(pageData viewmodels.ProjectPage) (data []viewmodels.Project, total int64)
 }
 
 //返回service操作类
@@ -147,12 +147,12 @@ func (s *projectService) GetList(page int, size int) []viewmodels.Project {
 }
 
 // 后端获得列表
-func (s *projectService) GetListBs(pageData viewmodels.ProjectPage, InsideCategoryId int) (data []viewmodels.Project, total int64) {
+func (s *projectService) GetListBs(pageData viewmodels.ProjectPage) (data []viewmodels.Project, total int64) {
 	if pageData.Size > 100 {
 		pageData.Size = 100
 	}
 	datalist := make([]viewmodels.Project, 0)
-	projectData, count := s.dao.GetPageBs(pageData, InsideCategoryId)
+	projectData, count := s.dao.GetPageBs(pageData)
 	for _, data := range projectData {
 		projectVM := makeProjectVM(&data)
 		datalist = append(datalist, projectVM)

web/backstage/project_bs.go

@@ -8,6 +8,7 @@ package backstage
 
 import (
 	"fmt"
+	"log"
 
 	"github.com/kataras/iris/v12"
 	"go.mod/services"
@@ -34,25 +35,23 @@ type ProjectBs struct {
 // @Router /backstage/project/list [get]
 func (c *ProjectBs) PostList() {
 
-	pageData, err := c.ServiceProject.ValidRulePage(c.Ctx)
+	pageData := viewmodels.ProjectPage{}
+	err := c.Ctx.ReadJSON(&pageData)
 	if err != nil {
-		ErrMsg := utils.FormValidError(err)
-		c.Ctx.JSON(iris.Map{"code": -1, "msg": ErrMsg})
+		log.Println("folder-ValidRule-ReadForm转换异常, error=", err)
+		c.Ctx.JSON(iris.Map{"code": -1, "msg": err})
 		return
 	}
 
-	// 标段ID
-	InsideCategoryId := 0
-	if pageData.InsideCategoryId != "" {
-		InsideCategoryId, err = utils.GetDecryptId(pageData.InsideCategoryId)
-		if err != nil {
-			c.Ctx.JSON(iris.Map{"code": -1, "msg": "ReadJSON转换异常,请检查参数"})
-			return
-		}
+	err = pageData.ValidatePage()
+	if err != nil {
+		log.Println("参数验证错误, error=", err)
+		c.Ctx.JSON(iris.Map{"code": -1, "msg": err})
+		return
 	}
 
 	// 获得项目信息
-	dataList, total := c.ServiceProject.GetListBs(pageData, InsideCategoryId)
+	dataList, total := c.ServiceProject.GetListBs(pageData)
 	data := map[string]interface{}{
 		"items": dataList,
 		"total": total,

web/viewmodels/project.go

@@ -41,12 +41,13 @@ type ProjectInfo struct {
 	Mobile      string `from:"mobile" json:"mobile"`
 	Name        string `from:"name" json:"name"`
 }
+
 type ProjectPage struct {
-	Page             int    `form:"page" json:"page"`
-	Size             int    `form:"size" json:"size"`
-	PageSize         int    `form:"pageSize" json:"pageSize"`
-	InsideCategoryId string `form:"insideCategoryId" json:"insideCategoryId"`
-	Search           string `form:"search" json:"search"`
+	Page             int      `form:"page" json:"page"`
+	Size             int      `form:"size" json:"size"`
+	PageSize         int      `form:"pageSize" json:"pageSize"`
+	InsideCategoryId []string `form:"category" json:"category"`
+	Search           string   `form:"search" json:"search"`
 }
 
 func (l ProjectPage) ValidatePage() error {