fix: add base field

Author: suyuan32

api/gogen/ent/gen.go

@@ -323,7 +323,7 @@ func GenCRUDData(g *GenEntLogicContext, projectCtx *ctx.ProjectContext, schema *
 	predicateData.WriteString(fmt.Sprintf("\tvar predicates []predicate.%s\n", schema.Name))
 	count := 0
 	for _, v := range schema.Fields {
-		if v.Name == "id" || count >= g.SearchKeyNum {
+		if v.Name == "id" || v.Name == "tenant_id" || count >= g.SearchKeyNum {
 			continue
 		}
 
@@ -476,7 +476,7 @@ func GenApiData(schema *load.Schema, ctx GenEntLogicContext) (string, error) {
 	}
 
 	for _, v := range schema.Fields {
-		if v.Name == "id" {
+		if v.Name == "id" || v.Name == "tenant_id" {
 			continue
 		}
 

config/config.go

@@ -18,7 +18,7 @@ var OldGoZeroVersion = []string{"v1.6.0", "v1.6.1", "v1.6.2", "v1.6.3", "v1.6.4"
 const DefaultToolVersion = "v1.8.2"
 
 // GoctlsVersion is goctls version
-const GoctlsVersion = "v1.10.5"
+const GoctlsVersion = "v1.10.6"
 
 // CoreVersion is the core service version.
 const CoreVersion = "v1.6.6"

rpc/generator/ent/gen.go

@@ -390,7 +390,7 @@ func GenCRUDData(g *GenEntLogicContext, projectCtx *ctx.ProjectContext, schema *
 	predicateData.WriteString(fmt.Sprintf("\tvar predicates []predicate.%s\n", schema.Name))
 	count := 0
 	for _, v := range schema.Fields {
-		if v.Name == "id" || count >= g.SearchKeyNum {
+		if v.Name == "id" || v.Name == "tenant_id" || count >= g.SearchKeyNum {
 			continue
 		}
 
@@ -621,7 +621,7 @@ func GenProtoData(schema *load.Schema, g GenEntLogicContext) (string, string, er
 	index = 3
 
 	for _, v := range schema.Fields {
-		if v.Name == "id" || count >= g.SearchKeyNum {
+		if v.Name == "id" || v.Name == "tenant_id" || count >= g.SearchKeyNum {
 			continue
 		}
 

util/entx/checker.go

@@ -46,7 +46,7 @@ func IsUpperProperty(prop string) bool {
 // IsBaseProperty returns true when prop name is
 // id, created_at, updated_at, deleted_at
 func IsBaseProperty(prop string) bool {
-	if prop == "id" || prop == "created_at" || prop == "updated_at" || prop == "deleted_at" {
+	if prop == "id" || prop == "created_at" || prop == "updated_at" || prop == "deleted_at" || prop == "tenant_id" {
 		return true
 	}
 	return false