|
|
@@ -33,7 +33,7 @@ func (m *EtaBusinessEdbPermission) GetItemsTotal(cond string, pars []interface{}
|
|
|
//o := orm.NewOrmUsingDB("data")
|
|
|
var totalNull sql2.NullInt64
|
|
|
sql := fmt.Sprintf(`SELECT COUNT(*) total FROM eta_business_edb_permission AS a
|
|
|
- JOIN edb_info AS b WHERE 1=1 %s`, cond)
|
|
|
+ LEFT JOIN edb_info AS b WHERE 1=1 %s`, cond)
|
|
|
err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Scan(&totalNull).Error
|
|
|
if err != nil {
|
|
|
return
|
|
|
@@ -54,7 +54,7 @@ func (m *EtaBusinessEdbPermission) GetItemsPageByCondition(cond string, pars []i
|
|
|
order = ` ORDER BY ` + orderRule
|
|
|
}
|
|
|
sql := fmt.Sprintf(`SELECT %s FROM eta_business_edb_permission AS a
|
|
|
- JOIN edb_info AS b WHERE 1=1 %s %s`, fields, cond, order)
|
|
|
+ LEFT JOIN edb_info AS b WHERE 1=1 %s %s`, fields, cond, order)
|
|
|
sql += fmt.Sprintf(` LIMIT %d,%d`, startSize, pageSize)
|
|
|
|
|
|
err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Find(&items).Error
|
