From 7be12a6127f9627743e41f51833cd2d3bacf7eef Mon Sep 17 00:00:00 2001 From: louwenzhi Date: Thu, 29 Apr 2021 10:02:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E4=BA=BA=E5=91=98=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/base/implments/WorkPlacePersonLst.dao.impl.go | 2 +- models/base/Person.model.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dao/base/implments/WorkPlacePersonLst.dao.impl.go b/dao/base/implments/WorkPlacePersonLst.dao.impl.go index 0285ac4..6cf4460 100644 --- a/dao/base/implments/WorkPlacePersonLst.dao.impl.go +++ b/dao/base/implments/WorkPlacePersonLst.dao.impl.go @@ -344,7 +344,7 @@ func (impl *WorkPlacePersonLstDAOImplement) SelectUnAllot(workSpaces []int) ([]m ******************************************************************************/ func (impl *WorkPlacePersonLstDAOImplement) SelectPersonByWorkPlace(personId string, workPlaceNr string) (*model.WorkPlacePersonLst, error) { var data model.WorkPlacePersonLst - ok, err := impl.session.Table(impl.meta.TableName).Where("PlantNr = ? and PersonId = ? and WorkPlaceNr = ?", impl.plantNr, personId, workPlaceNr).Get(&data) + ok, err := impl.session.Table(impl.meta.TableName).Join("INNER","Person","Person.PlantNr = WorkPlacePersonLst.PlantNr And Person.PersonNr = WorkPlacePersonLst.PersonNr").Where("WorkPlacePersonLst.PlantNr = ? and Person.PersonId = ? and WorkPlacePersonLst.WorkPlaceNr = ?", impl.plantNr, personId, workPlaceNr).Get(&data) if err != nil { return nil, grmi.NewDataBaseError(err) } diff --git a/models/base/Person.model.go b/models/base/Person.model.go index 327bf45..6fb1d37 100644 --- a/models/base/Person.model.go +++ b/models/base/Person.model.go @@ -21,7 +21,7 @@ import ( ******************************************************************************/ type Person struct { PlantNr int `xorm:"pk int 'PlantNr'" json:"Person-PlantNr"` - PersonNr int `xorm:"pk int 'PersonNr'" json:"Person-PersonNr"` + PersonNr int `xorm:"pk int 'PersonNr' autoincr" json:"Person-PersonNr"` PersonId string `xorm:"nvarchar(40) 'PersonId' not null" json:"Person-PersonId"` Name string `xorm:"nvarchar(40) 'Name' not null" json:"Person-Name"` Status int `xorm:"int 'Status' not null" json:"Person-Status"`