fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
laodaming 2023-11-22 18:55:05 +08:00
commit 060c134679
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
model/gmodel/ldap_group_logic.go
View File

@ -23,7 +23,7 @@ func (s *LdapGroupModel) FindAll(ctx context.Context, gorm *gorm.DB) (resp []Lda
// FindPage 分页查询
func (s *LdapGroupModel) FindPage(ctx context.Context, req FindPageReq) (resp []LdapGroup, total int64, err error) {
db := s.db.WithContext(ctx).Model(&LdapGroup{})
db := s.db.WithContext(ctx).Model(&LdapGroup{}).Where("type != ?", "people")
if req.Fields != "" {
db = db.Select(req.Fields)
}

2
server/ldap-admin/internal/logic/getldapgroupslogic.go
View File

@ -39,7 +39,7 @@ func (l *GetLdapGroupsLogic) GetLdapGroups(req *types.GetLdapGroupsReq, userinfo
resList, resCount, err := l.svcCtx.AllModels.LdapGroup.FindPage(l.ctx, gmodel.FindPageReq{
Page: req.CurrentPage,
Limit: req.PerPage,
Fields: "id,name,keyword,remark,status,sort",
Fields: "id,type,name,keyword,remark,status,sort",
})
if err != nil {
return resp.SetStatus(basic.CodeServiceErr)