diff --git a/src/controller/system_user.go b/src/controller/system_user.go index 426fa037bb0046d2938ee1c245c948ac06d5c9f9..1a9ae446fa396b53ea4d1461f7e3331fbc4fc132 100644 --- a/src/controller/system_user.go +++ b/src/controller/system_user.go @@ -123,8 +123,9 @@ func CheckRepetition(c *gin.Context) { // 运维人员获取 func DevOps(c *gin.Context) { + isAll := c.Query("is_all") svc := service.User{User: header.GetUser(c)} - list, err := svc.DevOps() + list, err := svc.DevOps(isAll) if err != nil { SendJsonResponse(c, err, nil) return diff --git a/src/service/system_user.go b/src/service/system_user.go index fe02df5f0f3b7bad6cd34afc1b55cbd85696b473..7e74ef5b38f04b57e41f72ee9520c5b15639f28d 100644 --- a/src/service/system_user.go +++ b/src/service/system_user.go @@ -311,7 +311,7 @@ func (u *User) SystemUserUpdateState(params request.SystemUserStateReq) error { return nil } -func (o *User) DevOps() ([]entity.SystemUserInfo, error) { +func (o *User) DevOps(isAll string) ([]entity.SystemUserInfo, error) { var ( err error result []entity.SystemUserInfo @@ -322,11 +322,15 @@ func (o *User) DevOps() ([]entity.SystemUserInfo, error) { return result, resp.DbConnectError.WithError(err) } - err = db.Table("system_user").Alias("su"). + session := db.Table("system_user").Alias("su"). Join("LEFT", "system_user_role sur", "su.id = sur.user_id"). - Join("LEFT", "system_role sr", "sur.role_id = sr.role_id"). - Where("su.is_deleted = 0 and su.state =1 and sr.is_deleted = 0 and sr.state = 1 and role_type = 1"). - Select("DISTINCT su.*").Find(&result) + Join("LEFT", "system_role sr", "sur.role_id = sr.role_id").Select("DISTINCT su.*") + if isAll == "" { + err = session.Where("su.is_deleted = 0 and su.state =1 and sr.is_deleted = 0 and sr.state = 1 and role_type = 1").Find(&result) + } else { + err = session.Where("su.is_deleted = 0 and su.state =1 and sr.is_deleted = 0 and sr.state = 1").Find(&result) + } + if err != nil { return result, resp.DbSelectError.WithError(err) }