|
@@ -121,7 +121,7 @@ type CloudDiskListItem struct {
|
|
|
AdminId int `description:"创建人ID"`
|
|
|
AdminName string `description:"创建人"`
|
|
|
CreateTime string `description:"创建时间"`
|
|
|
- ButtonAuth *CloudDiskListButton `description:"按钮权限"`
|
|
|
+ ButtonAuth *CloudDiskListButton `description:"按钮权限" gorm:"-"`
|
|
|
}
|
|
|
|
|
|
// CloudDiskListButton 云盘列表按钮权限
|
|
@@ -141,7 +141,7 @@ type CloudDiskMenuResourcePath struct {
|
|
|
|
|
|
// GetCloudDiskMenuAndResourceList UNION获取云盘列表数据
|
|
|
func GetCloudDiskMenuAndResourceList(menuCond, resourceCond string, menuPars, resourcePars []interface{}, orderRule string) (items []*CloudDiskListItem, err error) {
|
|
|
- base := `SELECT menu_id AS item_id, menu_name AS item_name, 1 AS item_type, parent_id, size, "" AS resource_url, "" AS item_icon, admin_id, admin_name, create_time FROM cloud_disk_menu
|
|
|
+ base := `SELECT menu_id AS item_id, menu_name AS item_name, 1 AS item_type, parent_id, size, '' AS resource_url, '' AS item_icon, admin_id, admin_name, create_time FROM cloud_disk_menu
|
|
|
WHERE 1=1 %s
|
|
|
UNION
|
|
|
SELECT resource_id, CONCAT(resource_name,resource_suffix), 2, menu_id, size, resource_url, resource_icon, admin_id, admin_name, create_time FROM cloud_disk_resource
|