diff --git a/web/models/accesscardtab.go b/web/models/accesscardtab.go index 18cd703..239881d 100644 --- a/web/models/accesscardtab.go +++ b/web/models/accesscardtab.go @@ -140,7 +140,7 @@ func (t *Accesscardtab) Search(buildingid string, unit string, room string) (Con accesscardidList := make([]string, 0) var info AccesscardContract e := db.MasterEngine() - query := e.Table("accesscardtab").Join("LEFT", "propertytab", "accesscardtab.propertyid=propertytab.propertyid and accesscardtab.cid=propertytab.cid").Join("LEFT", "propertytypetab", "accesscardtab.propertytypeid=propertytypetab.propertytypeid and accesscardtab.cid=propertytypetab.cid").Join("LEFT", "contracttab", "accesscardtab.contractid=contracttab.contractid and accesscardtab.cid=contracttab.cid").Where("accesscardtab.cid=? ", t.Cid) + query := e.Table("accesscardtab").Join("RIGHT", "propertytab", "accesscardtab.propertyid=propertytab.propertyid and accesscardtab.cid=propertytab.cid").Join("LEFT", "propertytypetab", "accesscardtab.propertytypeid=propertytypetab.propertytypeid and accesscardtab.cid=propertytypetab.cid").Join("LEFT", "contracttab", "accesscardtab.contractid=contracttab.contractid and accesscardtab.cid=contracttab.cid").Where("propertytab.cid=? ", t.Cid) if !utils.ValueIsEmpty(buildingid) { query = query.And("propertytab.buildingid = ?", buildingid) }