From 0faaf323fb6e0279425c355924f4c7d2ffd5024e Mon Sep 17 00:00:00 2001
From: HuangZhi <huangzhi@wodcloud.com>
Date: Thu, 13 Jul 2023 12:44:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=A7=92=E8=89=B2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controller/system_user.go |  3 ++-
 src/service/system_user.go    | 14 +++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/controller/system_user.go b/src/controller/system_user.go
index 426fa03..1a9ae44 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 fe02df5..7e74ef5 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)
 	}
-- 
2.26.0