Forráskód Böngészése

标签改为硬删除

boweniac 2 napja
szülő
commit
bccc83f21c

+ 2 - 4
ent/client.go

@@ -3360,14 +3360,12 @@ func (c *LabelClient) QueryLabelRelationships(l *Label) *LabelRelationshipQuery
 
 // Hooks returns the client hooks.
 func (c *LabelClient) Hooks() []Hook {
-	hooks := c.hooks.Label
-	return append(hooks[:len(hooks):len(hooks)], label.Hooks[:]...)
+	return c.hooks.Label
 }
 
 // Interceptors returns the client interceptors.
 func (c *LabelClient) Interceptors() []Interceptor {
-	inters := c.inters.Label
-	return append(inters[:len(inters):len(inters)], label.Interceptors[:]...)
+	return c.inters.Label
 }
 
 func (c *LabelClient) mutate(ctx context.Context, m *LabelMutation) (Value, error) {

+ 1 - 12
ent/label.go

@@ -23,8 +23,6 @@ type Label struct {
 	UpdatedAt time.Time `json:"updated_at,omitempty"`
 	// Status 1: normal 2: ban | 状态 1 正常 2 禁用
 	Status uint8 `json:"status,omitempty"`
-	// Delete Time | 删除日期
-	DeletedAt time.Time `json:"deleted_at,omitempty"`
 	// 标签类型:1好友,2群组,3公众号,4企业微信联系人
 	Type int `json:"type,omitempty"`
 	// 标签名称
@@ -70,7 +68,7 @@ func (*Label) scanValues(columns []string) ([]any, error) {
 			values[i] = new(sql.NullInt64)
 		case label.FieldName, label.FieldConditions:
 			values[i] = new(sql.NullString)
-		case label.FieldCreatedAt, label.FieldUpdatedAt, label.FieldDeletedAt:
+		case label.FieldCreatedAt, label.FieldUpdatedAt:
 			values[i] = new(sql.NullTime)
 		default:
 			values[i] = new(sql.UnknownType)
@@ -111,12 +109,6 @@ func (l *Label) assignValues(columns []string, values []any) error {
 			} else if value.Valid {
 				l.Status = uint8(value.Int64)
 			}
-		case label.FieldDeletedAt:
-			if value, ok := values[i].(*sql.NullTime); !ok {
-				return fmt.Errorf("unexpected type %T for field deleted_at", values[i])
-			} else if value.Valid {
-				l.DeletedAt = value.Time
-			}
 		case label.FieldType:
 			if value, ok := values[i].(*sql.NullInt64); !ok {
 				return fmt.Errorf("unexpected type %T for field type", values[i])
@@ -203,9 +195,6 @@ func (l *Label) String() string {
 	builder.WriteString("status=")
 	builder.WriteString(fmt.Sprintf("%v", l.Status))
 	builder.WriteString(", ")
-	builder.WriteString("deleted_at=")
-	builder.WriteString(l.DeletedAt.Format(time.ANSIC))
-	builder.WriteString(", ")
 	builder.WriteString("type=")
 	builder.WriteString(fmt.Sprintf("%v", l.Type))
 	builder.WriteString(", ")

+ 0 - 16
ent/label/label.go

@@ -5,7 +5,6 @@ package label
 import (
 	"time"
 
-	"entgo.io/ent"
 	"entgo.io/ent/dialect/sql"
 	"entgo.io/ent/dialect/sql/sqlgraph"
 )
@@ -21,8 +20,6 @@ const (
 	FieldUpdatedAt = "updated_at"
 	// FieldStatus holds the string denoting the status field in the database.
 	FieldStatus = "status"
-	// FieldDeletedAt holds the string denoting the deleted_at field in the database.
-	FieldDeletedAt = "deleted_at"
 	// FieldType holds the string denoting the type field in the database.
 	FieldType = "type"
 	// FieldName holds the string denoting the name field in the database.
@@ -54,7 +51,6 @@ var Columns = []string{
 	FieldCreatedAt,
 	FieldUpdatedAt,
 	FieldStatus,
-	FieldDeletedAt,
 	FieldType,
 	FieldName,
 	FieldFrom,
@@ -73,14 +69,7 @@ func ValidColumn(column string) bool {
 	return false
 }
 
-// Note that the variables below are initialized by the runtime
-// package on the initialization of the application. Therefore,
-// it should be imported in the main as follows:
-//
-//	import _ "wechat-api/ent/runtime"
 var (
-	Hooks        [1]ent.Hook
-	Interceptors [1]ent.Interceptor
 	// DefaultCreatedAt holds the default value on creation for the "created_at" field.
 	DefaultCreatedAt func() time.Time
 	// DefaultUpdatedAt holds the default value on creation for the "updated_at" field.
@@ -126,11 +115,6 @@ func ByStatus(opts ...sql.OrderTermOption) OrderOption {
 	return sql.OrderByField(FieldStatus, opts...).ToFunc()
 }
 
-// ByDeletedAt orders the results by the deleted_at field.
-func ByDeletedAt(opts ...sql.OrderTermOption) OrderOption {
-	return sql.OrderByField(FieldDeletedAt, opts...).ToFunc()
-}
-
 // ByType orders the results by the type field.
 func ByType(opts ...sql.OrderTermOption) OrderOption {
 	return sql.OrderByField(FieldType, opts...).ToFunc()

+ 0 - 55
ent/label/where.go

@@ -70,11 +70,6 @@ func Status(v uint8) predicate.Label {
 	return predicate.Label(sql.FieldEQ(FieldStatus, v))
 }
 
-// DeletedAt applies equality check predicate on the "deleted_at" field. It's identical to DeletedAtEQ.
-func DeletedAt(v time.Time) predicate.Label {
-	return predicate.Label(sql.FieldEQ(FieldDeletedAt, v))
-}
-
 // Type applies equality check predicate on the "type" field. It's identical to TypeEQ.
 func Type(v int) predicate.Label {
 	return predicate.Label(sql.FieldEQ(FieldType, v))
@@ -235,56 +230,6 @@ func StatusNotNil() predicate.Label {
 	return predicate.Label(sql.FieldNotNull(FieldStatus))
 }
 
-// DeletedAtEQ applies the EQ predicate on the "deleted_at" field.
-func DeletedAtEQ(v time.Time) predicate.Label {
-	return predicate.Label(sql.FieldEQ(FieldDeletedAt, v))
-}
-
-// DeletedAtNEQ applies the NEQ predicate on the "deleted_at" field.
-func DeletedAtNEQ(v time.Time) predicate.Label {
-	return predicate.Label(sql.FieldNEQ(FieldDeletedAt, v))
-}
-
-// DeletedAtIn applies the In predicate on the "deleted_at" field.
-func DeletedAtIn(vs ...time.Time) predicate.Label {
-	return predicate.Label(sql.FieldIn(FieldDeletedAt, vs...))
-}
-
-// DeletedAtNotIn applies the NotIn predicate on the "deleted_at" field.
-func DeletedAtNotIn(vs ...time.Time) predicate.Label {
-	return predicate.Label(sql.FieldNotIn(FieldDeletedAt, vs...))
-}
-
-// DeletedAtGT applies the GT predicate on the "deleted_at" field.
-func DeletedAtGT(v time.Time) predicate.Label {
-	return predicate.Label(sql.FieldGT(FieldDeletedAt, v))
-}
-
-// DeletedAtGTE applies the GTE predicate on the "deleted_at" field.
-func DeletedAtGTE(v time.Time) predicate.Label {
-	return predicate.Label(sql.FieldGTE(FieldDeletedAt, v))
-}
-
-// DeletedAtLT applies the LT predicate on the "deleted_at" field.
-func DeletedAtLT(v time.Time) predicate.Label {
-	return predicate.Label(sql.FieldLT(FieldDeletedAt, v))
-}
-
-// DeletedAtLTE applies the LTE predicate on the "deleted_at" field.
-func DeletedAtLTE(v time.Time) predicate.Label {
-	return predicate.Label(sql.FieldLTE(FieldDeletedAt, v))
-}
-
-// DeletedAtIsNil applies the IsNil predicate on the "deleted_at" field.
-func DeletedAtIsNil() predicate.Label {
-	return predicate.Label(sql.FieldIsNull(FieldDeletedAt))
-}
-
-// DeletedAtNotNil applies the NotNil predicate on the "deleted_at" field.
-func DeletedAtNotNil() predicate.Label {
-	return predicate.Label(sql.FieldNotNull(FieldDeletedAt))
-}
-
 // TypeEQ applies the EQ predicate on the "type" field.
 func TypeEQ(v int) predicate.Label {
 	return predicate.Label(sql.FieldEQ(FieldType, v))

+ 2 - 89
ent/label_create.go

@@ -65,20 +65,6 @@ func (lc *LabelCreate) SetNillableStatus(u *uint8) *LabelCreate {
 	return lc
 }
 
-// SetDeletedAt sets the "deleted_at" field.
-func (lc *LabelCreate) SetDeletedAt(t time.Time) *LabelCreate {
-	lc.mutation.SetDeletedAt(t)
-	return lc
-}
-
-// SetNillableDeletedAt sets the "deleted_at" field if the given value is not nil.
-func (lc *LabelCreate) SetNillableDeletedAt(t *time.Time) *LabelCreate {
-	if t != nil {
-		lc.SetDeletedAt(*t)
-	}
-	return lc
-}
-
 // SetType sets the "type" field.
 func (lc *LabelCreate) SetType(i int) *LabelCreate {
 	lc.mutation.SetType(i)
@@ -191,9 +177,7 @@ func (lc *LabelCreate) Mutation() *LabelMutation {
 
 // Save creates the Label in the database.
 func (lc *LabelCreate) Save(ctx context.Context) (*Label, error) {
-	if err := lc.defaults(); err != nil {
-		return nil, err
-	}
+	lc.defaults()
 	return withHooks(ctx, lc.sqlSave, lc.mutation, lc.hooks)
 }
 
@@ -220,18 +204,12 @@ func (lc *LabelCreate) ExecX(ctx context.Context) {
 }
 
 // defaults sets the default values of the builder before save.
-func (lc *LabelCreate) defaults() error {
+func (lc *LabelCreate) defaults() {
 	if _, ok := lc.mutation.CreatedAt(); !ok {
-		if label.DefaultCreatedAt == nil {
-			return fmt.Errorf("ent: uninitialized label.DefaultCreatedAt (forgotten import ent/runtime?)")
-		}
 		v := label.DefaultCreatedAt()
 		lc.mutation.SetCreatedAt(v)
 	}
 	if _, ok := lc.mutation.UpdatedAt(); !ok {
-		if label.DefaultUpdatedAt == nil {
-			return fmt.Errorf("ent: uninitialized label.DefaultUpdatedAt (forgotten import ent/runtime?)")
-		}
 		v := label.DefaultUpdatedAt()
 		lc.mutation.SetUpdatedAt(v)
 	}
@@ -263,7 +241,6 @@ func (lc *LabelCreate) defaults() error {
 		v := label.DefaultOrganizationID
 		lc.mutation.SetOrganizationID(v)
 	}
-	return nil
 }
 
 // check runs all checks and user-defined validators on the builder.
@@ -331,10 +308,6 @@ func (lc *LabelCreate) createSpec() (*Label, *sqlgraph.CreateSpec) {
 		_spec.SetField(label.FieldStatus, field.TypeUint8, value)
 		_node.Status = value
 	}
-	if value, ok := lc.mutation.DeletedAt(); ok {
-		_spec.SetField(label.FieldDeletedAt, field.TypeTime, value)
-		_node.DeletedAt = value
-	}
 	if value, ok := lc.mutation.GetType(); ok {
 		_spec.SetField(label.FieldType, field.TypeInt, value)
 		_node.Type = value
@@ -463,24 +436,6 @@ func (u *LabelUpsert) ClearStatus() *LabelUpsert {
 	return u
 }
 
-// SetDeletedAt sets the "deleted_at" field.
-func (u *LabelUpsert) SetDeletedAt(v time.Time) *LabelUpsert {
-	u.Set(label.FieldDeletedAt, v)
-	return u
-}
-
-// UpdateDeletedAt sets the "deleted_at" field to the value that was provided on create.
-func (u *LabelUpsert) UpdateDeletedAt() *LabelUpsert {
-	u.SetExcluded(label.FieldDeletedAt)
-	return u
-}
-
-// ClearDeletedAt clears the value of the "deleted_at" field.
-func (u *LabelUpsert) ClearDeletedAt() *LabelUpsert {
-	u.SetNull(label.FieldDeletedAt)
-	return u
-}
-
 // SetType sets the "type" field.
 func (u *LabelUpsert) SetType(v int) *LabelUpsert {
 	u.Set(label.FieldType, v)
@@ -682,27 +637,6 @@ func (u *LabelUpsertOne) ClearStatus() *LabelUpsertOne {
 	})
 }
 
-// SetDeletedAt sets the "deleted_at" field.
-func (u *LabelUpsertOne) SetDeletedAt(v time.Time) *LabelUpsertOne {
-	return u.Update(func(s *LabelUpsert) {
-		s.SetDeletedAt(v)
-	})
-}
-
-// UpdateDeletedAt sets the "deleted_at" field to the value that was provided on create.
-func (u *LabelUpsertOne) UpdateDeletedAt() *LabelUpsertOne {
-	return u.Update(func(s *LabelUpsert) {
-		s.UpdateDeletedAt()
-	})
-}
-
-// ClearDeletedAt clears the value of the "deleted_at" field.
-func (u *LabelUpsertOne) ClearDeletedAt() *LabelUpsertOne {
-	return u.Update(func(s *LabelUpsert) {
-		s.ClearDeletedAt()
-	})
-}
-
 // SetType sets the "type" field.
 func (u *LabelUpsertOne) SetType(v int) *LabelUpsertOne {
 	return u.Update(func(s *LabelUpsert) {
@@ -1088,27 +1022,6 @@ func (u *LabelUpsertBulk) ClearStatus() *LabelUpsertBulk {
 	})
 }
 
-// SetDeletedAt sets the "deleted_at" field.
-func (u *LabelUpsertBulk) SetDeletedAt(v time.Time) *LabelUpsertBulk {
-	return u.Update(func(s *LabelUpsert) {
-		s.SetDeletedAt(v)
-	})
-}
-
-// UpdateDeletedAt sets the "deleted_at" field to the value that was provided on create.
-func (u *LabelUpsertBulk) UpdateDeletedAt() *LabelUpsertBulk {
-	return u.Update(func(s *LabelUpsert) {
-		s.UpdateDeletedAt()
-	})
-}
-
-// ClearDeletedAt clears the value of the "deleted_at" field.
-func (u *LabelUpsertBulk) ClearDeletedAt() *LabelUpsertBulk {
-	return u.Update(func(s *LabelUpsert) {
-		s.ClearDeletedAt()
-	})
-}
-
 // SetType sets the "type" field.
 func (u *LabelUpsertBulk) SetType(v int) *LabelUpsertBulk {
 	return u.Update(func(s *LabelUpsert) {

+ 4 - 68
ent/label_update.go

@@ -62,26 +62,6 @@ func (lu *LabelUpdate) ClearStatus() *LabelUpdate {
 	return lu
 }
 
-// SetDeletedAt sets the "deleted_at" field.
-func (lu *LabelUpdate) SetDeletedAt(t time.Time) *LabelUpdate {
-	lu.mutation.SetDeletedAt(t)
-	return lu
-}
-
-// SetNillableDeletedAt sets the "deleted_at" field if the given value is not nil.
-func (lu *LabelUpdate) SetNillableDeletedAt(t *time.Time) *LabelUpdate {
-	if t != nil {
-		lu.SetDeletedAt(*t)
-	}
-	return lu
-}
-
-// ClearDeletedAt clears the value of the "deleted_at" field.
-func (lu *LabelUpdate) ClearDeletedAt() *LabelUpdate {
-	lu.mutation.ClearDeletedAt()
-	return lu
-}
-
 // SetType sets the "type" field.
 func (lu *LabelUpdate) SetType(i int) *LabelUpdate {
 	lu.mutation.ResetType()
@@ -249,9 +229,7 @@ func (lu *LabelUpdate) RemoveLabelRelationships(l ...*LabelRelationship) *LabelU
 
 // Save executes the query and returns the number of nodes affected by the update operation.
 func (lu *LabelUpdate) Save(ctx context.Context) (int, error) {
-	if err := lu.defaults(); err != nil {
-		return 0, err
-	}
+	lu.defaults()
 	return withHooks(ctx, lu.sqlSave, lu.mutation, lu.hooks)
 }
 
@@ -278,15 +256,11 @@ func (lu *LabelUpdate) ExecX(ctx context.Context) {
 }
 
 // defaults sets the default values of the builder before save.
-func (lu *LabelUpdate) defaults() error {
+func (lu *LabelUpdate) defaults() {
 	if _, ok := lu.mutation.UpdatedAt(); !ok {
-		if label.UpdateDefaultUpdatedAt == nil {
-			return fmt.Errorf("ent: uninitialized label.UpdateDefaultUpdatedAt (forgotten import ent/runtime?)")
-		}
 		v := label.UpdateDefaultUpdatedAt()
 		lu.mutation.SetUpdatedAt(v)
 	}
-	return nil
 }
 
 func (lu *LabelUpdate) sqlSave(ctx context.Context) (n int, err error) {
@@ -310,12 +284,6 @@ func (lu *LabelUpdate) sqlSave(ctx context.Context) (n int, err error) {
 	if lu.mutation.StatusCleared() {
 		_spec.ClearField(label.FieldStatus, field.TypeUint8)
 	}
-	if value, ok := lu.mutation.DeletedAt(); ok {
-		_spec.SetField(label.FieldDeletedAt, field.TypeTime, value)
-	}
-	if lu.mutation.DeletedAtCleared() {
-		_spec.ClearField(label.FieldDeletedAt, field.TypeTime)
-	}
 	if value, ok := lu.mutation.GetType(); ok {
 		_spec.SetField(label.FieldType, field.TypeInt, value)
 	}
@@ -450,26 +418,6 @@ func (luo *LabelUpdateOne) ClearStatus() *LabelUpdateOne {
 	return luo
 }
 
-// SetDeletedAt sets the "deleted_at" field.
-func (luo *LabelUpdateOne) SetDeletedAt(t time.Time) *LabelUpdateOne {
-	luo.mutation.SetDeletedAt(t)
-	return luo
-}
-
-// SetNillableDeletedAt sets the "deleted_at" field if the given value is not nil.
-func (luo *LabelUpdateOne) SetNillableDeletedAt(t *time.Time) *LabelUpdateOne {
-	if t != nil {
-		luo.SetDeletedAt(*t)
-	}
-	return luo
-}
-
-// ClearDeletedAt clears the value of the "deleted_at" field.
-func (luo *LabelUpdateOne) ClearDeletedAt() *LabelUpdateOne {
-	luo.mutation.ClearDeletedAt()
-	return luo
-}
-
 // SetType sets the "type" field.
 func (luo *LabelUpdateOne) SetType(i int) *LabelUpdateOne {
 	luo.mutation.ResetType()
@@ -650,9 +598,7 @@ func (luo *LabelUpdateOne) Select(field string, fields ...string) *LabelUpdateOn
 
 // Save executes the query and returns the updated Label entity.
 func (luo *LabelUpdateOne) Save(ctx context.Context) (*Label, error) {
-	if err := luo.defaults(); err != nil {
-		return nil, err
-	}
+	luo.defaults()
 	return withHooks(ctx, luo.sqlSave, luo.mutation, luo.hooks)
 }
 
@@ -679,15 +625,11 @@ func (luo *LabelUpdateOne) ExecX(ctx context.Context) {
 }
 
 // defaults sets the default values of the builder before save.
-func (luo *LabelUpdateOne) defaults() error {
+func (luo *LabelUpdateOne) defaults() {
 	if _, ok := luo.mutation.UpdatedAt(); !ok {
-		if label.UpdateDefaultUpdatedAt == nil {
-			return fmt.Errorf("ent: uninitialized label.UpdateDefaultUpdatedAt (forgotten import ent/runtime?)")
-		}
 		v := label.UpdateDefaultUpdatedAt()
 		luo.mutation.SetUpdatedAt(v)
 	}
-	return nil
 }
 
 func (luo *LabelUpdateOne) sqlSave(ctx context.Context) (_node *Label, err error) {
@@ -728,12 +670,6 @@ func (luo *LabelUpdateOne) sqlSave(ctx context.Context) (_node *Label, err error
 	if luo.mutation.StatusCleared() {
 		_spec.ClearField(label.FieldStatus, field.TypeUint8)
 	}
-	if value, ok := luo.mutation.DeletedAt(); ok {
-		_spec.SetField(label.FieldDeletedAt, field.TypeTime, value)
-	}
-	if luo.mutation.DeletedAtCleared() {
-		_spec.ClearField(label.FieldDeletedAt, field.TypeTime)
-	}
 	if value, ok := luo.mutation.GetType(); ok {
 		_spec.SetField(label.FieldType, field.TypeInt, value)
 	}

+ 1 - 2
ent/migrate/schema.go

@@ -576,7 +576,6 @@ var (
 		{Name: "created_at", Type: field.TypeTime, Comment: "Create Time | 创建日期"},
 		{Name: "updated_at", Type: field.TypeTime, Comment: "Update Time | 修改日期"},
 		{Name: "status", Type: field.TypeUint8, Nullable: true, Comment: "Status 1: normal 2: ban | 状态 1 正常 2 禁用", Default: 1},
-		{Name: "deleted_at", Type: field.TypeTime, Nullable: true, Comment: "Delete Time | 删除日期"},
 		{Name: "type", Type: field.TypeInt, Comment: "标签类型:1好友,2群组,3公众号,4企业微信联系人", Default: 1},
 		{Name: "name", Type: field.TypeString, Comment: "标签名称", Default: ""},
 		{Name: "from", Type: field.TypeInt, Comment: "标签来源:1后台创建 2个微同步", Default: 1},
@@ -593,7 +592,7 @@ var (
 			{
 				Name:    "label_name_organization_id",
 				Unique:  true,
-				Columns: []*schema.Column{LabelColumns[6], LabelColumns[10]},
+				Columns: []*schema.Column{LabelColumns[5], LabelColumns[9]},
 			},
 		},
 	}

+ 1 - 74
ent/mutation.go

@@ -22395,7 +22395,6 @@ type LabelMutation struct {
 	updated_at                 *time.Time
 	status                     *uint8
 	addstatus                  *int8
-	deleted_at                 *time.Time
 	_type                      *int
 	add_type                   *int
 	name                       *string
@@ -22661,55 +22660,6 @@ func (m *LabelMutation) ResetStatus() {
 	delete(m.clearedFields, label.FieldStatus)
 }
 
-// SetDeletedAt sets the "deleted_at" field.
-func (m *LabelMutation) SetDeletedAt(t time.Time) {
-	m.deleted_at = &t
-}
-
-// DeletedAt returns the value of the "deleted_at" field in the mutation.
-func (m *LabelMutation) DeletedAt() (r time.Time, exists bool) {
-	v := m.deleted_at
-	if v == nil {
-		return
-	}
-	return *v, true
-}
-
-// OldDeletedAt returns the old "deleted_at" field's value of the Label entity.
-// If the Label object wasn't provided to the builder, the object is fetched from the database.
-// An error is returned if the mutation operation is not UpdateOne, or the database query fails.
-func (m *LabelMutation) OldDeletedAt(ctx context.Context) (v time.Time, err error) {
-	if !m.op.Is(OpUpdateOne) {
-		return v, errors.New("OldDeletedAt is only allowed on UpdateOne operations")
-	}
-	if m.id == nil || m.oldValue == nil {
-		return v, errors.New("OldDeletedAt requires an ID field in the mutation")
-	}
-	oldValue, err := m.oldValue(ctx)
-	if err != nil {
-		return v, fmt.Errorf("querying old value for OldDeletedAt: %w", err)
-	}
-	return oldValue.DeletedAt, nil
-}
-
-// ClearDeletedAt clears the value of the "deleted_at" field.
-func (m *LabelMutation) ClearDeletedAt() {
-	m.deleted_at = nil
-	m.clearedFields[label.FieldDeletedAt] = struct{}{}
-}
-
-// DeletedAtCleared returns if the "deleted_at" field was cleared in this mutation.
-func (m *LabelMutation) DeletedAtCleared() bool {
-	_, ok := m.clearedFields[label.FieldDeletedAt]
-	return ok
-}
-
-// ResetDeletedAt resets all changes to the "deleted_at" field.
-func (m *LabelMutation) ResetDeletedAt() {
-	m.deleted_at = nil
-	delete(m.clearedFields, label.FieldDeletedAt)
-}
-
 // SetType sets the "type" field.
 func (m *LabelMutation) SetType(i int) {
 	m._type = &i
@@ -23121,7 +23071,7 @@ func (m *LabelMutation) Type() string {
 // order to get all numeric fields that were incremented/decremented, call
 // AddedFields().
 func (m *LabelMutation) Fields() []string {
-	fields := make([]string, 0, 10)
+	fields := make([]string, 0, 9)
 	if m.created_at != nil {
 		fields = append(fields, label.FieldCreatedAt)
 	}
@@ -23131,9 +23081,6 @@ func (m *LabelMutation) Fields() []string {
 	if m.status != nil {
 		fields = append(fields, label.FieldStatus)
 	}
-	if m.deleted_at != nil {
-		fields = append(fields, label.FieldDeletedAt)
-	}
 	if m._type != nil {
 		fields = append(fields, label.FieldType)
 	}
@@ -23166,8 +23113,6 @@ func (m *LabelMutation) Field(name string) (ent.Value, bool) {
 		return m.UpdatedAt()
 	case label.FieldStatus:
 		return m.Status()
-	case label.FieldDeletedAt:
-		return m.DeletedAt()
 	case label.FieldType:
 		return m.GetType()
 	case label.FieldName:
@@ -23195,8 +23140,6 @@ func (m *LabelMutation) OldField(ctx context.Context, name string) (ent.Value, e
 		return m.OldUpdatedAt(ctx)
 	case label.FieldStatus:
 		return m.OldStatus(ctx)
-	case label.FieldDeletedAt:
-		return m.OldDeletedAt(ctx)
 	case label.FieldType:
 		return m.OldType(ctx)
 	case label.FieldName:
@@ -23239,13 +23182,6 @@ func (m *LabelMutation) SetField(name string, value ent.Value) error {
 		}
 		m.SetStatus(v)
 		return nil
-	case label.FieldDeletedAt:
-		v, ok := value.(time.Time)
-		if !ok {
-			return fmt.Errorf("unexpected type %T for field %s", value, name)
-		}
-		m.SetDeletedAt(v)
-		return nil
 	case label.FieldType:
 		v, ok := value.(int)
 		if !ok {
@@ -23384,9 +23320,6 @@ func (m *LabelMutation) ClearedFields() []string {
 	if m.FieldCleared(label.FieldStatus) {
 		fields = append(fields, label.FieldStatus)
 	}
-	if m.FieldCleared(label.FieldDeletedAt) {
-		fields = append(fields, label.FieldDeletedAt)
-	}
 	if m.FieldCleared(label.FieldConditions) {
 		fields = append(fields, label.FieldConditions)
 	}
@@ -23410,9 +23343,6 @@ func (m *LabelMutation) ClearField(name string) error {
 	case label.FieldStatus:
 		m.ClearStatus()
 		return nil
-	case label.FieldDeletedAt:
-		m.ClearDeletedAt()
-		return nil
 	case label.FieldConditions:
 		m.ClearConditions()
 		return nil
@@ -23436,9 +23366,6 @@ func (m *LabelMutation) ResetField(name string) error {
 	case label.FieldStatus:
 		m.ResetStatus()
 		return nil
-	case label.FieldDeletedAt:
-		m.ResetDeletedAt()
-		return nil
 	case label.FieldType:
 		m.ResetType()
 		return nil

+ 0 - 4
ent/runtime/runtime.go

@@ -948,10 +948,6 @@ func init() {
 	// employeeconfig.DefaultOrganizationID holds the default value on creation for the organization_id field.
 	employeeconfig.DefaultOrganizationID = employeeconfigDescOrganizationID.Default.(uint64)
 	labelMixin := schema.Label{}.Mixin()
-	labelMixinHooks2 := labelMixin[2].Hooks()
-	label.Hooks[0] = labelMixinHooks2[0]
-	labelMixinInters2 := labelMixin[2].Interceptors()
-	label.Interceptors[0] = labelMixinInters2[0]
 	labelMixinFields0 := labelMixin[0].Fields()
 	_ = labelMixinFields0
 	labelMixinFields1 := labelMixin[1].Fields()

+ 1 - 2
ent/schema/label.go

@@ -8,7 +8,6 @@ import (
 	"entgo.io/ent/schema/field"
 	"entgo.io/ent/schema/index"
 	"github.com/suyuan32/simple-admin-common/orm/ent/mixins"
-	"wechat-api/ent/schema/localmixin"
 )
 
 type Label struct {
@@ -42,7 +41,7 @@ func (Label) Mixin() []ent.Mixin {
 	return []ent.Mixin{
 		mixins.IDMixin{},
 		mixins.StatusMixin{},
-		localmixin.SoftDeleteMixin{},
+		//localmixin.SoftDeleteMixin{},
 	}
 }
 

+ 0 - 24
ent/set_not_nil.go

@@ -5072,30 +5072,6 @@ func (l *LabelCreate) SetNotNilStatus(value *uint8) *LabelCreate {
 }
 
 // set field if value's pointer is not nil.
-func (l *LabelUpdate) SetNotNilDeletedAt(value *time.Time) *LabelUpdate {
-	if value != nil {
-		return l.SetDeletedAt(*value)
-	}
-	return l
-}
-
-// set field if value's pointer is not nil.
-func (l *LabelUpdateOne) SetNotNilDeletedAt(value *time.Time) *LabelUpdateOne {
-	if value != nil {
-		return l.SetDeletedAt(*value)
-	}
-	return l
-}
-
-// set field if value's pointer is not nil.
-func (l *LabelCreate) SetNotNilDeletedAt(value *time.Time) *LabelCreate {
-	if value != nil {
-		return l.SetDeletedAt(*value)
-	}
-	return l
-}
-
-// set field if value's pointer is not nil.
 func (l *LabelUpdate) SetNotNilType(value *int) *LabelUpdate {
 	if value != nil {
 		return l.SetType(*value)

+ 3 - 3
internal/service/wechat/wx_safe_change.go

@@ -138,7 +138,7 @@ func (w *WxSafeChange) LabelSafe() error {
 	// 获取现有联系人的所有标签名称
 	contactLabelNames, err := w.Tx.Label.Query().
 		Where(
-			label.DeletedAtIsNil(),
+			//label.DeletedAtIsNil(),
 			label.HasLabelRelationshipsWith(
 				//labelrelationship.DeletedAtIsNil(),
 				labelrelationship.HasContactsWith(
@@ -158,7 +158,7 @@ func (w *WxSafeChange) LabelSafe() error {
 
 	newLabelNames, err := w.Tx.Label.Query().
 		Where(
-			label.DeletedAtIsNil(),
+			//label.DeletedAtIsNil(),
 			label.OrganizationIDEQ(w.OrganizationId),
 		).
 		Select(label.FieldName).
@@ -201,7 +201,7 @@ func (w *WxSafeChange) LabelSafe() error {
 	logx.Info("diffLabelNames", diffLabelNames)
 	orgLabels, err := w.Tx.Label.Query().
 		Where(
-			label.DeletedAtIsNil(),
+			//label.DeletedAtIsNil(),
 			label.OrganizationIDEQ(w.OrganizationId),
 			label.NameIn(contactLabelNames...),
 		).