merge: main to multi-tenant

features/udm_user/repo/repo_udm_sub_user.go

@@ -7,8 +7,9 @@ import (
 
 	"be.ems/features/udm_user/model"
 	"be.ems/lib/core/datasource"
-	"be.ems/lib/core/utils/parse"
 	"be.ems/lib/log"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/utils/repo"
 )
 
 // 实例化数据层 RepoUdmSubUser 结构体
@@ -62,7 +63,7 @@ func (r *RepoUdmSubUser) convertResultRows(rows []map[string]any) []model.UdmSub
 		UdmUser := model.UdmSubUser{}
 		for key, value := range row {
 			if keyMapper, ok := r.resultMap[key]; ok {
-				datasource.SetFieldValue(&UdmUser, keyMapper, value)
+				repo.SetFieldValue(&UdmUser, keyMapper, value)
 			}
 		}
 		arr = append(arr, UdmUser)
@@ -91,7 +92,7 @@ func (r *RepoUdmSubUser) SelectPage(query map[string]any) map[string]any {
 	if v, ok := query["tenantName"]; ok && v != "" {
 		var tenantID []string
 		err := datasource.DefaultDB().Table("sys_tenant").
-			Where("tenant_name='?'", v).Cols("tenant_id").Distinct().Find(&tenantID)
+			Where("tenant_name='?'", v).Select("tenant_id").Distinct().Find(&tenantID)
 		if err != nil {
 			log.Errorf("Find tenant_id err => %v", err)
 		}
@@ -127,7 +128,7 @@ func (r *RepoUdmSubUser) SelectPage(query map[string]any) map[string]any {
 	}
 
 	// 分页
-	pageNum, pageSize := datasource.PageNumSize(query["pageNum"], query["pageSize"])
+	pageNum, pageSize := repo.PageNumSize(query["pageNum"], query["pageSize"])
 	pageSql := " limit ?,? "
 	params = append(params, pageNum*pageSize)
 	params = append(params, pageSize)