williamet/cas_tt_cloud_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目管理，增加科研机构下实验室列表信息

Browse Source
This commit is contained in:
henry
2021-12-13 10:55:53 +08:00
parent fdcd46bf49
commit b9cc39d37a
11 changed files with 216 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/api/enterprise/controller/manage/expert.go
View File

@ -6,6 +6,7 @@ import (
"SciencesServer/app/basic/controller"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/session"
"errors"
"fmt"
"strings"
)
@ -32,11 +33,13 @@ func (c *Expert) research(page, pageSize int, count *int64, where ...*model2.Mod
// 实验室下存在专家
mUserResearch := model.NewUserResearch()
_, err := model2.FirstField(mUserResearch.UserResearch, []string{"id", "research_id"},
isExist, err := model2.FirstField(mUserResearch.UserResearch, []string{"id", "research_id"},
model2.NewWhere("uid", c.UID), model2.NewWhere("invalid_status", model2.InvalidStatusForNot))
if err != nil {
return nil, err
} else if !isExist {
return nil, errors.New("操作错误，无权限查看")
}
// 查询科研机构下所有实验室
mManageLaboratory := model.NewManageLaboratory()
@ -107,6 +110,7 @@ func (c *Expert) Instance(name, mobile string, page, pageSize int) (*controller.
out, err = c.research(page, pageSize, &count, where...)
// 实验室
} else if c.Identity == config.TenantUserIdentityForLaboratory {
out, err = c.laboratory(page, pageSize, &count, where...)
}
if err != nil {
return nil, err