Merge pull request '添加非admin用户的权限数据过滤' (#179) from feature_log into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/179
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>

dao/log/implments/ArtDemandHead.dao.impl.go

@@ -195,7 +195,9 @@ func (impl *ArtDemandHeadDAOImplement) Select(predicates []grmi.Predicate, order
 	} else {
 		session = session.Where(where, parameters...)
 	}
-
+	if impl.userid != "admin" {
+		session = session.Where("ArtId in (select ArtId from LOG_VendorArtLst where VendorId in (select VendorId from LOG_VendorUserLst where UserId = ?))", impl.userid)
+	}
 	session = session.OrderBy(meta.ArtDemandHead_PlantNr.ColumnName)
 	if orderByFields != nil {
 		for _, field := range orderByFields {
@@ -231,7 +233,11 @@ func (impl *ArtDemandHeadDAOImplement) SelectAndPaging(paging *grmi.Paging, pred
 	} else {
 		session = session.Where(where, parameters...)
 	}
-
+	if impl.userid != "admin" {
+		where += " and ArtId in (select ArtId from LOG_VendorArtLst where VendorId in (select VendorId from LOG_VendorUserLst where UserId = ?)) "
+		parameters = append(parameters, impl.userid)
+		session = session.Where("ArtId in (select ArtId from LOG_VendorArtLst where VendorId in (select VendorId from LOG_VendorUserLst where UserId = ?))", impl.userid)
+	}
 	count, err := session.Count(impl.meta.Indicator)
 	if err != nil {
 		return grmi.EmptyPagingResult, err

dao/log/implments/ArtDemandLst.dao.impl.go

@@ -195,7 +195,9 @@ func (impl *ArtDemandLstDAOImplement) Select(predicates []grmi.Predicate, orderB
 	} else {
 		session = session.Where(where, parameters...)
 	}
-
+	if impl.userid != "admin" {
+		session = session.Where("ArtId in (select ArtId from LOG_VendorArtLst where VendorId in (select VendorId from LOG_VendorUserLst where UserId = ?))", impl.userid)
+	}
 	session = session.OrderBy(meta.ArtDemandLst_PlantNr.ColumnName)
 	if orderByFields != nil {
 		for _, field := range orderByFields {
@@ -231,7 +233,11 @@ func (impl *ArtDemandLstDAOImplement) SelectAndPaging(paging *grmi.Paging, predi
 	} else {
 		session = session.Where(where, parameters...)
 	}
-
+	if impl.userid != "admin" {
+		where += " and ArtId in (select ArtId from LOG_VendorArtLst where VendorId in (select VendorId from LOG_VendorUserLst where UserId = ?)) "
+		parameters = append(parameters, impl.userid)
+		session = session.Where("ArtId in (select ArtId from LOG_VendorArtLst where VendorId in (select VendorId from LOG_VendorUserLst where UserId = ?))", impl.userid)
+	}
 	count, err := session.Count(impl.meta.Indicator)
 	if err != nil {
 		return grmi.EmptyPagingResult, err
@@ -248,6 +254,7 @@ func (impl *ArtDemandLstDAOImplement) SelectAndPaging(paging *grmi.Paging, predi
 	if where != "" {
 		where = " where " + where
 	}
+
 	err = impl.session.Table(impl.meta.TableName).SQL("select * from "+impl.meta.TableName+where+orderBy+" offset ? row fetch next ? row only", parameters...).Find(&data)
 	if err != nil {
 		return grmi.EmptyPagingResult, err