From 2a37ac47e66e761ba5b7a9a656b6e5ed7691856f Mon Sep 17 00:00:00 2001 From: zhangxin Date: Mon, 19 Apr 2021 10:46:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BF=AE=E6=94=B9=E7=9A=84co?= =?UTF-8?q?lname=E4=BF=AE=E6=94=B9=E8=BF=9E=E8=A1=A8=E6=97=B6=E7=9A=84cond?= =?UTF-8?q?ition?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/base/implments/WeekModelLst.dao.impl.go | 4 +--- dao/base/implments/WorkCalendarLst.dao.impl.go | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dao/base/implments/WeekModelLst.dao.impl.go b/dao/base/implments/WeekModelLst.dao.impl.go index e475551..62ec57c 100644 --- a/dao/base/implments/WeekModelLst.dao.impl.go +++ b/dao/base/implments/WeekModelLst.dao.impl.go @@ -365,12 +365,10 @@ func (impl *WeekModelLstDAOImplement) SelectJoinDayModel(weekModelNr int) ([]mod // session = session.Where(where, parameters...) //} session.Where("WeekModelLst.PlantNr = ? and WeekModelLst.WeekModelNr = ?", impl.plantNr, weekModelNr) - condition := fmt.Sprintf("%s.PlantNr = %s.PlantNr and %s.%s = %s.%s", + condition := fmt.Sprintf("%s.PlantNr = %s.PlantNr and %s = %s", meta.WeekModelLst.TableName, meta.DayModel.TableName, - meta.WeekModelLst.TableName, meta.WeekModelLst_DayModelNr.ColumnName, - meta.DayModel.TableName, meta.WeekModelLst_DayModelNr.ColumnName) session.Join("LEFT", meta.DayModel.TableName, condition) session = session.OrderBy("WeekModelLst.PlantNr") diff --git a/dao/base/implments/WorkCalendarLst.dao.impl.go b/dao/base/implments/WorkCalendarLst.dao.impl.go index 07bfff3..822e1be 100644 --- a/dao/base/implments/WorkCalendarLst.dao.impl.go +++ b/dao/base/implments/WorkCalendarLst.dao.impl.go @@ -366,12 +366,10 @@ func (impl *WorkCalendarLstDAOImplement) SelectJoinDayModel(workCalendarNr int) // session = session.Where(where, parameters...) //} session.Where("WorkCalendarLst.PlantNr = ? and WorkCalendarLst.WorkCalendarNr = ?", impl.plantNr, workCalendarNr) - condition := fmt.Sprintf("%s.PlantNr = %s.PlantNr and %s.%s = %s.%s", + condition := fmt.Sprintf("%s.PlantNr = %s.PlantNr and %s = %s", meta.WorkCalendarLst.TableName, meta.DayModel.TableName, - meta.WorkCalendarLst.TableName, meta.WorkCalendarLst_DayModelNr.ColumnName, - meta.DayModel.TableName, meta.DayModel_DayModelNr.ColumnName) session.Join("LEFT", meta.DayModel.TableName, condition) session = session.OrderBy("WorkCalendarLst.PlantNr")