Browse Source

资产搜索列表添加用户关联过滤

pull/399/head
zhangxin 3 years ago
parent
commit
ae79406989
2 changed files with 12 additions and 3 deletions
  1. +1
    -1
      web/controllers/pm_asset_controller.go
  2. +11
    -2
      web/models/pm_asset_model.go

+ 1
- 1
web/controllers/pm_asset_controller.go View File

@ -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


+ 11
- 2
web/models/pm_asset_model.go View File

@ -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
}


Loading…
Cancel
Save