api 更新

ent/runtime/runtime.go

@@ -156,41 +156,13 @@ func init() {
 	// addwechatfriendlog.DefaultNickName holds the default value on creation for the nick_name field.
 	addwechatfriendlog.DefaultNickName = addwechatfriendlogDescNickName.Default.(string)
 	// addwechatfriendlog.NickNameValidator is a validator for the "nick_name" field. It is called by the builders before save.
-	addwechatfriendlog.NickNameValidator = func() func(string) error {
-		validators := addwechatfriendlogDescNickName.Validators
-		fns := [...]func(string) error{
-			validators[0].(func(string) error),
-			validators[1].(func(string) error),
-		}
-		return func(nick_name string) error {
-			for _, fn := range fns {
-				if err := fn(nick_name); err != nil {
-					return err
-				}
-			}
-			return nil
-		}
-	}()
+	addwechatfriendlog.NickNameValidator = addwechatfriendlogDescNickName.Validators[0].(func(string) error)
 	// addwechatfriendlogDescAvatar is the schema descriptor for avatar field.
 	addwechatfriendlogDescAvatar := addwechatfriendlogFields[16].Descriptor()
 	// addwechatfriendlog.DefaultAvatar holds the default value on creation for the avatar field.
 	addwechatfriendlog.DefaultAvatar = addwechatfriendlogDescAvatar.Default.(string)
 	// addwechatfriendlog.AvatarValidator is a validator for the "avatar" field. It is called by the builders before save.
-	addwechatfriendlog.AvatarValidator = func() func(string) error {
-		validators := addwechatfriendlogDescAvatar.Validators
-		fns := [...]func(string) error{
-			validators[0].(func(string) error),
-			validators[1].(func(string) error),
-		}
-		return func(avatar string) error {
-			for _, fn := range fns {
-				if err := fn(avatar); err != nil {
-					return err
-				}
-			}
-			return nil
-		}
-	}()
+	addwechatfriendlog.AvatarValidator = addwechatfriendlogDescAvatar.Validators[0].(func(string) error)
 	// addwechatfriendlogDescOrganizationID is the schema descriptor for organization_id field.
 	addwechatfriendlogDescOrganizationID := addwechatfriendlogFields[17].Descriptor()
 	// addwechatfriendlog.DefaultOrganizationID holds the default value on creation for the organization_id field.

ent/schema/add_wechat_friend_log.go

@@ -69,8 +69,8 @@ func (AddWechatFriendLog) Fields() []ent.Field {
 			return time.Now().Unix()
 		}).Comment("修改时间戳"),
 		field.Int("source").Default(1).Optional().Comment("1.api录入 2.人工导入"),
-		field.String("nick_name").NotEmpty().Default("").Optional().MaxLen(255).Comment("用户名称"),
-		field.String("avatar").NotEmpty().Default("").MaxLen(255).Optional().Comment("用户头像"),
+		field.String("nick_name").Default("").Optional().MaxLen(255).Comment("用户名称"),
+		field.String("avatar").Default("").MaxLen(255).Optional().Comment("用户头像"),
 		field.Int64("organization_id").Default(0).Optional().Comment("组织架构id"),
 	}
 }

internal/logic/add_friend/add_friend_list_logic.go

@@ -58,21 +58,9 @@ func (l *AddFriendListLogic) AddFriendList(req *types.AddFriendListReq) (resp *t
 		predicates = append(predicates, addwechatfriendlog.FindContent(*req.FindContent))
 	}
 
-	var IsCanAdd []int
+	//var IsCanAdd []int
 	if req.Status != nil {
-		switch *req.Status {
-		case 1:
-			IsCanAdd = append(IsCanAdd, 0, 1)
-		case 2:
-			IsCanAdd = append(IsCanAdd, 3, 4, 6)
-		case 3:
-			IsCanAdd = append(IsCanAdd, 2)
-		default:
-			IsCanAdd = append(IsCanAdd, 0, 1, 2, 3, 4, 5, 6)
-		}
-		if len(IsCanAdd) < 7 {
-			predicates = append(predicates, addwechatfriendlog.IsCanAddIn(IsCanAdd...))
-		}
+		predicates = append(predicates, addwechatfriendlog.IsCanAddEQ(*req.Status))
 	}
 	data, err := l.svcCtx.DB.AddWechatFriendLog.Query().Where(predicates...).Page(l.ctx, req.Page, req.PageSize)
 	logx.Info("数据", data)
@@ -97,7 +85,6 @@ func (l *AddFriendListLogic) AddFriendList(req *types.AddFriendListReq) (resp *t
 				FindContent: &v.FindContent,
 				Status: func() *string {
 					statusMap := map[int]string{
-						0: "数据准备中",
 						1: "待执行",
 						2: "成功申请",
 						3: "执行错误",