diff --git a/web/controllers/pm_asset_controller.go b/web/controllers/pm_asset_controller.go index 939f4a6..6bba3df 100644 --- a/web/controllers/pm_asset_controller.go +++ b/web/controllers/pm_asset_controller.go @@ -201,7 +201,7 @@ func SelectArrPmAsset(ctx iris.Context) { } me := new(models.PmAsset) me.Finr = user.Pid - res, err := me.SelectAll() + res, err := me.SelectAll(user.Userid) if err != nil { supports.Error(ctx, iris.StatusBadRequest, "查询失败", nil) return diff --git a/web/models/pm_asset_model.go b/web/models/pm_asset_model.go index dc97fe9..f0c25f4 100644 --- a/web/models/pm_asset_model.go +++ b/web/models/pm_asset_model.go @@ -164,10 +164,19 @@ func (t *PmAsset) SelectOne() (PmAsset, error) { } //查所有 -func (t *PmAsset) SelectAll() ([]PmAsset, error) { +func (t *PmAsset) SelectAll(userId string) ([]PmAsset, error) { e := db.Eloquent.Master() + assetIdLi := make([]int, 0) + err := e.Table("PM_UserAssetLst").Where("UserId = ?", userId).Cols("AssetId").Find(&assetIdLi) + if err != nil { + return nil, err + } var data []PmAsset - err := e.Table("pm_asset").Where("finr = ?", t.Finr).Find(&data) + if userId == "admin" { + err = e.Table("pm_asset").Where("finr = ?", t.Finr).Find(&data) + } else { + err = e.Table("pm_asset").Where("finr = ?", t.Finr).In("assetid", assetIdLi).Find(&data) + } if err != nil { return data, err }