houyaf před 3 roky
rodič
revize
6f1441c1bc

+ 24 - 24
repositories/biz_object_oam_params_repo.go

@@ -19,14 +19,14 @@ func NewBizObjectOAMParamsRepo(engine *xorm.Engine) *BizObjectOAMParamsRepo {
 }
 
 func (d *BizObjectOAMParamsRepo) GetList(m map[string]interface{}) ([]viewmodels.BizObjectOAMParamsInfo, error) {
-    sqlSelect  := ` SELECT A.* ,
-                           B.object_title,
-                           B.object_code,
-                           C.oam_title,
-                           C.oam_code   `
-    sqlFrom    := ` FROM   biz_object_oam_params AS A
-                    LEFT   biz_object            AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id)
-                    LEFT   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)`
+    sqlSelect  := ` SELECT    A.* ,
+                              B.object_title,
+                              B.object_code,
+                              C.oam_title,
+                              C.oam_code   `
+    sqlFrom    := ` FROM      biz_object_oam_params AS A
+                    LEFT JOIN biz_object            AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_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)`
     sqlWhere   := ` WHERE  A.deleted_flag = 0    `
     if bizId, ok := m["bizId"]; ok {
         sqlWhere += fmt.Sprintf(" AND A.biz_id = %d ", bizId)
@@ -49,14 +49,14 @@ func (d *BizObjectOAMParamsRepo) GetList(m map[string]interface{}) ([]viewmodels
 }
 
 func (d *BizObjectOAMParamsRepo) GetById(bizId, objectId, oamId, orId int64) (*viewmodels.BizObjectOAMParamsInfo, error) {
-    sqlSelect  := ` SELECT A.* ,
-                           B.object_title,
-                           B.object_code,
-                           C.oam_title,
-                           C.oam_code   `
-    sqlFrom    := ` FROM   biz_object_oam_params AS A
-                    LEFT   biz_object            AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id)
-                    LEFT   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)`
+    sqlSelect  := ` SELECT    A.* ,
+                              B.object_title,
+                              B.object_code,
+                              C.oam_title,
+                              C.oam_code   `
+    sqlFrom    := ` FROM      biz_object_oam_params AS A
+                    LEFT JOIN biz_object            AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_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)`
     sqlWhere   := ` WHERE A.deleted_flag = 0    `
     sqlWhere   += fmt.Sprintf(" AND A.biz_id    = %d ", bizId)
     sqlWhere   += fmt.Sprintf(" AND A.object_id = %d ", objectId)
@@ -73,14 +73,14 @@ func (d *BizObjectOAMParamsRepo) GetById(bizId, objectId, oamId, orId int64) (*v
 }
 
 func (d *BizObjectOAMParamsRepo) GetListById(bizId, objectId, oamId int64) ([]viewmodels.BizObjectOAMParamsInfo, error) {
-    sqlSelect  := ` SELECT A.* ,
-                           B.object_title,
-                           B.object_code,
-                           C.oam_title,
-                           C.oam_code   `
-    sqlFrom    := ` FROM   biz_object_oam_params AS A
-                    LEFT   biz_object            AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id)
-                    LEFT   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)`
+    sqlSelect  := ` SELECT    A.* ,
+                              B.object_title,
+                              B.object_code,
+                              C.oam_title,
+                              C.oam_code   `
+    sqlFrom    := ` FROM      biz_object_oam_params AS A
+                    LEFT JOIN biz_object            AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_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)`
     sqlWhere   := ` WHERE A.deleted_flag = 0    `
     sqlWhere   += fmt.Sprintf(" AND A.biz_id    = %d ", bizId)
     sqlWhere   += fmt.Sprintf(" AND A.object_id = %d ", objectId)

+ 8 - 8
repositories/biz_object_oam_repo.go

@@ -49,10 +49,10 @@ func (d *BizObjectOAMRepo) GetList(m map[string]interface{}) ([]viewmodels.BizOb
 }
 
 func (d *BizObjectOAMRepo) GetListById(bizId, objectId int64) ([]viewmodels.BizObjectOAMInfo, error) {
-    sqlSelect  := ` SELECT A.*,
-                           B.object_title,
-                           B.object_code,
-                           B.object_type `
+    sqlSelect  := ` SELECT    A.*,
+                              B.object_title,
+                              B.object_code,
+                              B.object_type `
     sqlFrom    := ` FROM      biz_object_oam AS A
                     LEFT JOIN biz_object     AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id)`
     
@@ -71,10 +71,10 @@ func (d *BizObjectOAMRepo) GetListById(bizId, objectId int64) ([]viewmodels.BizO
 }
 
 func (d *BizObjectOAMRepo) GetById(bizId, objectId, oamId int64) (*viewmodels.BizObjectOAMInfo, error) {
-    sqlSelect  := ` SELECT A.*,
-                           B.object_title,
-                           B.object_code,
-                           B.object_type `
+    sqlSelect  := ` SELECT    A.*,
+                              B.object_title,
+                              B.object_code,
+                              B.object_type `
     sqlFrom    := ` FROM      biz_object_oam AS A
                     LEFT JOIN biz_object     AS B ON (A.biz_id = B.biz_id AND A.object_id = B.object_id)`