|
@@ -1,9 +1,9 @@
|
|
|
package repositories
|
|
package repositories
|
|
|
|
|
|
|
|
import (
|
|
import (
|
|
|
-"errors"
|
|
|
|
|
-"fmt"
|
|
|
|
|
-"xorm.io/xorm"
|
|
|
|
|
|
|
+ "errors"
|
|
|
|
|
+ "fmt"
|
|
|
|
|
+ "xorm.io/xorm"
|
|
|
"xps/datamodel"
|
|
"xps/datamodel"
|
|
|
"xps/viewmodel"
|
|
"xps/viewmodel"
|
|
|
)
|
|
)
|
|
@@ -67,7 +67,7 @@ func (d *BizObjectOAMMappingRepo) GetById(bizId, objectId, oamId, orId int64) (*
|
|
|
LEFT JOIN biz_object_oam AS C ON (A.biz_id = C.biz_id AND A.object_id = C.object_id AND A.oam_id = C.oam_id)
|
|
LEFT JOIN biz_object_oam AS C ON (A.biz_id = C.biz_id AND A.object_id = C.object_id AND A.oam_id = C.oam_id)
|
|
|
LEFT JOIN ds_model AS E ON (A.mapping_model_id = E.model_id)
|
|
LEFT JOIN ds_model AS E ON (A.mapping_model_id = E.model_id)
|
|
|
LEFT JOIN ds_object AS F ON (A.mapping_model_id = F.model_id AND A.mapping_object_id = F.object_id)`
|
|
LEFT JOIN ds_object AS F ON (A.mapping_model_id = F.model_id AND A.mapping_object_id = F.object_id)`
|
|
|
- sqlWhere := ` WHERE 1=1 `
|
|
|
|
|
|
|
+ sqlWhere := ` WHERE 1 = 1 `
|
|
|
sqlWhere += fmt.Sprintf(" AND A.biz_id = %d ", bizId)
|
|
sqlWhere += fmt.Sprintf(" AND A.biz_id = %d ", bizId)
|
|
|
sqlWhere += fmt.Sprintf(" AND A.object_id = %d ", objectId)
|
|
sqlWhere += fmt.Sprintf(" AND A.object_id = %d ", objectId)
|
|
|
sqlWhere += fmt.Sprintf(" AND A.oam_id = %d ", oamId)
|
|
sqlWhere += fmt.Sprintf(" AND A.oam_id = %d ", oamId)
|
|
@@ -96,7 +96,7 @@ func (d *BizObjectOAMMappingRepo) GetListById(bizId, objectId, oamId int64) ([]v
|
|
|
LEFT JOIN biz_object_oam AS C ON (A.biz_id = C.biz_id AND A.object_id = C.object_id AND A.oam_id = C.oam_id)
|
|
LEFT JOIN biz_object_oam AS C ON (A.biz_id = C.biz_id AND A.object_id = C.object_id AND A.oam_id = C.oam_id)
|
|
|
LEFT JOIN ds_model AS E ON (A.mapping_model_id = E.model_id)
|
|
LEFT JOIN ds_model AS E ON (A.mapping_model_id = E.model_id)
|
|
|
LEFT JOIN ds_object AS F ON (A.mapping_model_id = F.model_id AND A.mapping_object_id = F.object_id)`
|
|
LEFT JOIN ds_object AS F ON (A.mapping_model_id = F.model_id AND A.mapping_object_id = F.object_id)`
|
|
|
- sqlWhere := ` WHERE 1=1 `
|
|
|
|
|
|
|
+ sqlWhere := ` WHERE 1 = 1 `
|
|
|
sqlWhere += fmt.Sprintf(" AND A.biz_id = %d ", bizId)
|
|
sqlWhere += fmt.Sprintf(" AND A.biz_id = %d ", bizId)
|
|
|
sqlWhere += fmt.Sprintf(" AND A.object_id = %d ", objectId)
|
|
sqlWhere += fmt.Sprintf(" AND A.object_id = %d ", objectId)
|
|
|
sqlWhere += fmt.Sprintf(" AND A.oam_id = %d ", oamId)
|
|
sqlWhere += fmt.Sprintf(" AND A.oam_id = %d ", oamId)
|
houyaf