init

cmd/cache/cache_data_init.go

@@ -15,7 +15,7 @@ func InitCacheData() {
 func modelObjectToCache() {
 	modelObjectRepo := modelRepo.NewModelObjectRepo(datasource.InstanceMaster())
 	modelObjectAttrRepo := modelRepo.NewModelObjectAttrRepo(datasource.InstanceMaster())
-	//modelObjectOAMRepo  := modelRepo.NewModelObjectOAMRepo(datasource.InstanceMaster())
+	modelObjectOAMRepo := modelRepo.NewModelObjectOAMRepo(datasource.InstanceMaster())
 
 	modelObjectList, err1 := modelObjectRepo.GetAll()
 	if err1 != nil {
@@ -30,7 +30,7 @@ func modelObjectToCache() {
 			return
 		}
 		modelObjectAttrsToCache(modelObjectAttrRepo, o.ModelId, o.ObjectId)
-		//modelObjectOAMToCache(modelObjectOAMRepo, o.ModelId, o.ObjectId)
+		modelObjectOAMToCache(modelObjectOAMRepo, o.ModelId, o.ObjectId)
 	}
 }
 

pkg/app/repository/app_cat_repo.go

@@ -46,11 +46,12 @@ func (d *AppCatRepo) GetPage(m map[string]interface{}) (*base.PageResult, error)
 		return nil, err2
 	}
 
-	pageResult := &base.PageResult{}
-	pageResult.Data = datalist
-	pageResult.Total = total
-	pageResult.PageSize = limit
-	pageResult.Page = page
+	pageResult := &base.PageResult{
+		Total:    total,
+		PageSize: limit,
+		Page:     page,
+		Data:     datalist,
+	}
 	return pageResult, nil
 }
 

pkg/app/repository/app_permit_repo.go

@@ -18,19 +18,19 @@ func NewAppPermitRepo(engine *xorm.Engine) *AppPermitRepo {
 }
 
 func (d *AppPermitRepo) GetList(m map[string]interface{}) ([]viewmodel.AppPermitInfo, error) {
-	sqlSelect := ` SELECT A.app_id,
-                          B.app_title,
-                          A.role_id,
-                          A.permit_id,
-                          A.permit_title,
-                          A.permit_code,
-                          A.permit_desc,
-                          A.permit_type,
-                          A.root_id,
-                          A.parent_id,
-                          A.sort_no     `
-	sqlFrom := ` FROM   app_permit  AS A
-                   JOIN   app         AS B ON (A.app_id = B.app_id) `
+	sqlSelect := ` SELECT   A.app_id,
+	                          B.app_title,
+	                          A.role_id,
+	                          A.permit_id,
+	                          A.permit_title,
+	                          A.permit_code,
+	                          A.permit_desc,
+	                          A.permit_type,
+	                          A.root_id,
+	                          A.parent_id,
+	                          A.sort_no     `
+	sqlFrom := ` FROM     app_permit  AS A
+                     JOIN     app         AS B ON (A.app_id = B.app_id) `
 	sqlWhere := ` WHERE  A.deleted_flag = 0 `
 	if appKey, ok := m["appKey"]; ok {
 		sqlWhere += " AND B.app_key = '" + fmt.Sprintf("%s", appKey) + "'"
@@ -67,7 +67,7 @@ func (d *AppPermitRepo) GetListById(appId, roleId int64) ([]viewmodel.AppPermitI
                           A.root_id,
                           A.parent_id,
                           A.sort_no     `
-	sqlFrom := ` FROM   app_permit  AS A
+	sqlFrom := `  FROM   app_permit  AS A
                    JOIN   app         AS B ON (A.app_id = B.app_id) `
 	sqlWhere := ` WHERE  A.deleted_flag = 0 `
 	sqlWhere += fmt.Sprintf(" AND A.app_id = %d ", appId)
@@ -95,11 +95,11 @@ func (d *AppPermitRepo) GetListByKey(appKey string, roleId int64) ([]viewmodel.A
                           A.root_id,
                           A.parent_id,
                           A.sort_no     `
-	sqlFrom := ` FROM  app_permit  AS A
+	sqlFrom := `  FROM  app_permit  AS A
                    JOIN  app         AS B ON (A.app_id = B.app_id) `
-	sqlWhere := ` WHERE A.deleted_flag = 0 `
-	sqlWhere += ` AND B.app_key = '` + appKey + "'"
-	sqlWhere += ` AND A.role_id =  ` + fmt.Sprintf("%d", roleId)
+	sqlWhere := `  WHERE A.deleted_flag = 0 `
+	sqlWhere += `  AND B.app_key = '` + appKey + "'"
+	sqlWhere += `  AND A.role_id =  ` + fmt.Sprintf("%d", roleId)
 	sqlOrderBy := " ORDER BY A.app_id, A.role_id, A.parent_id, A.sort_no "
 
 	datalist := make([]viewmodel.AppPermitInfo, 0)