Ver Fonte

修改为强限定接口

yjp há 5 dias atrás
pai
commit
1839954fee

+ 4 - 4
convenient/entity_crud/service.go

@@ -149,7 +149,7 @@ func Delete(tableName string, callbacks *DeleteCallbacks, needTx bool, scopeFiel
 					return err
 				}
 
-				err = database.DeleteEntityWithScope(tx, tableName, e, scopeFields...)
+				err = database.DeleteEntityWithScope(tx, tableName, e, scopeFields)
 				if err != nil {
 					return err
 				}
@@ -170,7 +170,7 @@ func Delete(tableName string, callbacks *DeleteCallbacks, needTx bool, scopeFiel
 				return nil, callbackOnDeleteErrorReturn(callbacks, c, params, e, prepared, err, i)
 			}
 
-			err = database.DeleteEntityWithScope(dbExecutor, tableName, e, scopeFields...)
+			err = database.DeleteEntityWithScope(dbExecutor, tableName, e, scopeFields)
 			if err != nil {
 				return nil, callbackOnDeleteErrorReturn(callbacks, c, params, e, prepared, err, i)
 			}
@@ -237,7 +237,7 @@ func Update(tableName string, needLastUpdateUserID bool, callbacks *UpdateCallba
 					return err
 				}
 
-				err = database.UpdateEntityWithScope(tx, tableName, e, scopeFields...)
+				err = database.UpdateEntityWithScope(tx, tableName, e, scopeFields)
 				if err != nil {
 					return err
 				}
@@ -258,7 +258,7 @@ func Update(tableName string, needLastUpdateUserID bool, callbacks *UpdateCallba
 				return nil, callbackOnUpdateErrorReturn(callbacks, c, params, e, prepared, err, i)
 			}
 
-			err = database.UpdateEntityWithScope(dbExecutor, tableName, e, scopeFields...)
+			err = database.UpdateEntityWithScope(dbExecutor, tableName, e, scopeFields)
 			if err != nil {
 				return nil, callbackOnUpdateErrorReturn(callbacks, c, params, e, prepared, err, i)
 			}

+ 2 - 2
convenient/value_object_crud/service.go

@@ -122,7 +122,7 @@ func Delete(tableName string, callbacks *DeleteCallbacks, needTx bool, scopeFiel
 					return err
 				}
 
-				err = database.DeleteEntityWithScope(tx, tableName, valueObject, scopeFields...)
+				err = database.DeleteEntityWithScope(tx, tableName, valueObject, scopeFields)
 				if err != nil {
 					return err
 				}
@@ -143,7 +143,7 @@ func Delete(tableName string, callbacks *DeleteCallbacks, needTx bool, scopeFiel
 				return nil, callbackOnDeleteErrorReturn(callbacks, c, params, valueObject, make(map[string]any), err, i)
 			}
 
-			err = database.DeleteEntityWithScope(dbExecutor, tableName, valueObject, scopeFields...)
+			err = database.DeleteEntityWithScope(dbExecutor, tableName, valueObject, scopeFields)
 			if err != nil {
 				return nil, callbackOnDeleteErrorReturn(callbacks, c, params, valueObject, make(map[string]any), err, i)
 			}

+ 3 - 3
framework/core/infrastructure/database/database.go

@@ -255,7 +255,7 @@ func DeleteEntity(executor Executor, tableName string, e any) error {
 // - scopeFields: 范围字段名
 // 返回值:
 // - 错误
-func DeleteEntityWithScope(executor Executor, tableName string, e any, scopeFields ...string) error {
+func DeleteEntityWithScope(executor Executor, tableName string, e any, scopeFields []string) error {
 	return deleteEntityCommon(executor, tableName, e, scopeFields...)
 }
 
@@ -341,7 +341,7 @@ func UpdateEntity(executor Executor, tableName string, e any) error {
 // - scopeFields: 范围字段名
 // 返回值:
 // - 错误
-func UpdateEntityWithScope(executor Executor, tableName string, e any, scopeFields ...string) error {
+func UpdateEntityWithScope(executor Executor, tableName string, e any, scopeFields []string) error {
 	_, err := updateEntityCommon(executor, tableName, e, scopeFields...)
 	if err != nil {
 		return err
@@ -371,7 +371,7 @@ func UpdateEntityWithRowsAffected(executor Executor, tableName string, e any) (i
 // 返回值:
 // - 影响行数
 // - 错误
-func UpdateEntityWithRowsAffectedAndScope(executor Executor, tableName string, e any, scopeFields ...string) (int64, error) {
+func UpdateEntityWithRowsAffectedAndScope(executor Executor, tableName string, e any, scopeFields []string) (int64, error) {
 	return updateEntityCommon(executor, tableName, e, scopeFields...)
 }