system: user update

model/system_user.go

@@ -11,6 +11,8 @@ import (
 	pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
 )
 
+const AdminUser = "kpt_user"
+
 type SystemUser struct {
 	Id              int64                  `json:"id"`
 	Name            string                 `json:"name"`

module/backend/neck_ring_warning.go

@@ -144,7 +144,7 @@ func (s *StoreEntry) NeckRingWarningHealthCowList(ctx context.Context, req *past
 		pref.Where("a.level = ?", req.Level)
 	}
 
-	if err = pref.Order("a.level DESC").
+	if err = pref.Order("a.level DESC,a.score ASC").
 		Group("a.cow_id").
 		Count(&count).
 		Limit(int(pagination.PageSize)).

module/backend/system_service.go

@@ -142,7 +142,8 @@ func (s *StoreEntry) SearchSystemUserList(ctx context.Context, req *pasturePb.Se
 	var count int64 = 0
 	pref := s.DB.Model(new(model.SystemUser)).
 		Where("is_delete = ?", operationPb.IsShow_OK).
-		Where("FIND_IN_SET(?, pasture_ids) > ?", userModel.AppPasture.Id, 0)
+		Where("FIND_IN_SET(?, pasture_ids) > ?", userModel.AppPasture.Id, 0).
+		Where("name != ?", model.AdminUser)
 
 	if req.Name != "" {
 		pref.Where("name like ?", fmt.Sprintf("%s%s%s", "%", req.Name, "%"))