From 7fe1720d01ec99bd5d98d9fa87f15471991d9ae3 Mon Sep 17 00:00:00 2001 From: DengBiao <2319963317@qq.com> Date: Sat, 9 Sep 2023 15:56:47 +0800 Subject: [PATCH] update --- .../svc/enterprise_manage/svc_central_kitchen_for_school.go | 1 + app/admin/svc/svc_data_statisstics.go | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/admin/svc/enterprise_manage/svc_central_kitchen_for_school.go b/app/admin/svc/enterprise_manage/svc_central_kitchen_for_school.go index 1813f32..1eb1350 100644 --- a/app/admin/svc/enterprise_manage/svc_central_kitchen_for_school.go +++ b/app/admin/svc/enterprise_manage/svc_central_kitchen_for_school.go @@ -321,6 +321,7 @@ func CentralKitchenForSchoolUserDeleteV2(req md.CentralKitchenForSchoolUserDelet //2、删除 user_identity _, err = db.Db.Where("identity =? or identity =?", enum2.UserIdentityForCentralKitchenForTeacher, enum2.UserIdentityForCentralKitchenForStudent). + In("id", userIdentityIds). Delete(model.UserIdentity{}) if err != nil { return diff --git a/app/admin/svc/svc_data_statisstics.go b/app/admin/svc/svc_data_statisstics.go index 4207719..c42522c 100644 --- a/app/admin/svc/svc_data_statisstics.go +++ b/app/admin/svc/svc_data_statisstics.go @@ -566,7 +566,7 @@ func CentralKitchenForSchoolDataStatisticsExport(req md.CentralKitchenForSchoolD var m []*db.CentralKitchenForSchoolPackageOrdForReserveWithUserIdentity sess := db.Db.Desc("central_kitchen_for_school_package_ord_for_reserve.id") if req.EnterpriseId != 0 { - sess.And("self_support_for_school_ord.enterprise_id =?", req.EnterpriseId) + sess.And("central_kitchen_for_school_package_ord_for_reserve.enterprise_id =?", req.EnterpriseId) } if req.StartDate != "" { sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start >= ?", req.StartDate) @@ -707,7 +707,7 @@ func CentralKitchenForSchoolDataStatisticsExport(req md.CentralKitchenForSchoolD var m []*db.CentralKitchenForSchoolPackageOrdForReserveWithUserIdentity sess := db.Db.Desc("central_kitchen_for_school_package_ord_for_reserve.id") if req.EnterpriseId != 0 { - sess.And("self_support_for_school_ord.enterprise_id =?", req.EnterpriseId) + sess.And("central_kitchen_for_school_package_ord_for_reserve.enterprise_id =?", req.EnterpriseId) } if req.StartDate != "" { sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start >= ?", req.StartDate) @@ -1210,7 +1210,7 @@ func CentralKitchenForSchoolDataStatisticsExport(req md.CentralKitchenForSchoolD var m []*db.CentralKitchenForSchoolPackageOrdForReserveWithUserIdentity sess := db.Db.Desc("central_kitchen_for_school_package_ord_for_reserve.id") if req.EnterpriseId != 0 { - sess.And("self_support_for_school_ord.enterprise_id =?", req.EnterpriseId) + sess.And("central_kitchen_for_school_package_ord_for_reserve.enterprise_id =?", req.EnterpriseId) } if req.StartDate != "" { sess.And("central_kitchen_for_school_package_ord_for_reserve.meal_time_start >= ?", req.StartDate)