evan/next-terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style(be):golangci-lint github action 增加timeout

Browse Source
This commit is contained in:
neverteaser
2021-03-16 17:22:16 +08:00
committed by dushixiang
parent d366cbd00d
commit 4f5a63751c
8 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/model/asset.go
View File

@ -95,7 +95,7 @@ func FindPageAsset(pageIndex, pageSize int, name, protocol, tags string, account
return nil, 0, err
}
if userGroupIds != nil {
if len(userGroupIds) > 0 {
db = db.Or("resource_sharers.user_group_id in ?", userGroupIds)
dbCounter = dbCounter.Or("resource_sharers.user_group_id in ?", userGroupIds)
}
@ -210,7 +210,7 @@ func CountAssetByUserId(userId string) (total int64, err error) {
return 0, err
}
if userGroupIds != nil {
if len(userGroupIds) > 0 {
db = db.Or("resource_sharers.user_group_id in ?", userGroupIds)
}
err = db.Find(&Asset{}).Count(&total).Error

2
pkg/model/credential.go
View File

@ -123,7 +123,7 @@ func CountCredentialByUserId(userId string) (total int64, err error) {
return 0, err
}
if userGroupIds != nil {
if len(userGroupIds) > 0 {
db = db.Or("resource_sharers.user_group_id in ?", userGroupIds)
}
err = db.Find(&Credential{}).Count(&total).Error

4
pkg/model/job.go
View File

@ -199,7 +199,7 @@ func (r CheckAssetStatusJob) Run() {
assets, _ = FindAssetByIds(strings.Split(r.ResourceIds, ","))
}
if assets == nil {
if len(assets) == 0 {
return
}
@ -257,7 +257,7 @@ func (r ShellJob) Run() {
assets, _ = FindAssetByProtocolAndIds("ssh", strings.Split(r.ResourceIds, ","))
}
if assets == nil {
if len(assets) == 0 {
return
}

2
pkg/model/resource-sharer.go
View File

@ -175,7 +175,7 @@ func FindAssetIdsByUserId(userId string) (assetIds []string, err error) {
}
db := global.DB.Table("resource_sharers").Select("resource_id").Where("user_id = ?", userId)
if groupIds != nil {
if len(groupIds) > 0 {
db = db.Or("user_group_id in ?", groupIds)
}
err = db.Find(&sharerAssetIds).Error