yjp 1 жил өмнө
parent
commit
98caf6adf5

+ 7 - 15
project/server/application/service/student.go

@@ -13,7 +13,6 @@ import (
 	"git.sxidc.com/go-framework/baize/framework/core/infrastructure"
 	"git.sxidc.com/go-framework/baize/framework/core/infrastructure/database"
 	"git.sxidc.com/go-framework/baize/framework/core/infrastructure/database/sql"
-	"git.sxidc.com/go-tools/utils/strutils"
 )
 
 var studentService = &StudentService{}
@@ -72,21 +71,14 @@ func (svc *StudentService) v1(appInstance *application.App) {
 				return errResponse, err
 			}
 
-			var conditions *sql.Conditions
-
 			if !hasRule {
-				conditions = sql.NewConditions()
-
-				if strutils.IsStringNotEmpty(e.Name) {
-					conditions.Equal(student.ColumnName, e.Name)
-				}
-			} else {
-				ruleConditions, err := query_rule.GetRulesAndFormConditions(dbSchema, "global", e.DomainCamelName(), i)
-				if err != nil {
-					return errResponse, err
-				}
-
-				conditions = ruleConditions
+				queryFunc := entity_crud.Query[student.Info](domain.TableName(dbSchema, e), "", nil, nil)
+				return queryFunc(c, params, objects, i)
+			}
+
+			conditions, err := query_rule.GetRulesAndFormConditions(dbSchema, "global", e.DomainCamelName(), i)
+			if err != nil {
+				return errResponse, err
 			}
 
 			results, totalCount, err := database.Query(i.DBExecutor(), &sql.QueryExecuteParams{