|
@@ -22,7 +22,7 @@ import (
|
|
"go.mod/web/viewmodels"
|
|
"go.mod/web/viewmodels"
|
|
)
|
|
)
|
|
|
|
|
|
-//定义项目Service接口
|
|
|
|
|
|
+// 定义项目Service接口
|
|
type ProjectService interface {
|
|
type ProjectService interface {
|
|
//ValidManager(code string, account string, password string) error
|
|
//ValidManager(code string, account string, password string) error
|
|
ValidRule(iris.Context) (viewmodels.Project, error)
|
|
ValidRule(iris.Context) (viewmodels.Project, error)
|
|
@@ -39,13 +39,13 @@ type ProjectService interface {
|
|
GetListBs(pageData viewmodels.ProjectPage, staffName string, category string) (data []viewmodels.Project, total int64)
|
|
GetListBs(pageData viewmodels.ProjectPage, staffName string, category string) (data []viewmodels.Project, total int64)
|
|
}
|
|
}
|
|
|
|
|
|
-//返回service操作类
|
|
|
|
|
|
+// 返回service操作类
|
|
type projectService struct {
|
|
type projectService struct {
|
|
dao *dao.ProjectDao
|
|
dao *dao.ProjectDao
|
|
validSave string
|
|
validSave string
|
|
}
|
|
}
|
|
|
|
|
|
-//创建项目service
|
|
|
|
|
|
+// 创建项目service
|
|
func NewProjectService() ProjectService {
|
|
func NewProjectService() ProjectService {
|
|
return &projectService{
|
|
return &projectService{
|
|
dao: dao.NewProjectDao(datasource.InstanceDbMaster()),
|
|
dao: dao.NewProjectDao(datasource.InstanceDbMaster()),
|
|
@@ -160,15 +160,16 @@ func (s *projectService) GetListBs(pageData viewmodels.ProjectPage, staffName st
|
|
return datalist, 0
|
|
return datalist, 0
|
|
}
|
|
}
|
|
|
|
|
|
- // 未启用--前端做完后启用
|
|
|
|
- // fmt.Println(staffName)
|
|
|
|
- // staffName = ""
|
|
|
|
|
|
+ // 2024-01-10 改成 拥有超级管理员 所有项目
|
|
|
|
+ // 办事处只能访问改办事处的
|
|
//待启用
|
|
//待启用
|
|
|
|
+ category = managerData.Office
|
|
if managerData.IsAdmin == 1 {
|
|
if managerData.IsAdmin == 1 {
|
|
category = ""
|
|
category = ""
|
|
}
|
|
}
|
|
//待启用
|
|
//待启用
|
|
|
|
|
|
|
|
+ // pageData里的InsideCategoryId 去除,不需要判断
|
|
projectData, count := s.dao.GetPageBsByCategory(pageData, category)
|
|
projectData, count := s.dao.GetPageBsByCategory(pageData, category)
|
|
|
|
|
|
for _, data := range projectData {
|
|
for _, data := range projectData {
|