|
@@ -98,8 +98,8 @@ func (s DeliverOrderService) List(ctx context.Context, req *work.DeliverOrderLis
|
|
|
g.Log().Infof("DeliverOrderService List roles %v", s.userInfo.Roles)
|
|
g.Log().Infof("DeliverOrderService List roles %v", s.userInfo.Roles)
|
|
|
//dao := s.Dao.DeliverOrderDao.As("a").LeftJoin("ctr_contract b", "a.contract_id=b.id").Unscoped().Where("a.deleted_time is null") // 改为关联项目
|
|
//dao := s.Dao.DeliverOrderDao.As("a").LeftJoin("ctr_contract b", "a.contract_id=b.id").Unscoped().Where("a.deleted_time is null") // 改为关联项目
|
|
|
dao := s.Dao.DeliverOrderDao.As("a").LeftJoin("proj_business b", "a.project_id=b.id").Unscoped().Where("a.deleted_time is null")
|
|
dao := s.Dao.DeliverOrderDao.As("a").LeftJoin("proj_business b", "a.project_id=b.id").Unscoped().Where("a.deleted_time is null")
|
|
|
- // 研发主管、研发总监、品质主管、总经理、销售总监、销售助理看全部的
|
|
|
|
|
- if service.StringsContains(s.userInfo.Roles, "ResearchAndDevelopmentDirector") || service.StringsContains(s.userInfo.Roles, "ResearchAndDevelopmentSupervisor") || service.StringsContains(s.userInfo.Roles, "QualityAssuranceSupervisor") || service.StringsContains(s.userInfo.Roles, "GeneralManager") || service.StringsContains(s.userInfo.Roles, "SalesDirector") || service.StringsContains(s.userInfo.Roles, "SaleAssociate") {
|
|
|
|
|
|
|
+ // 系统管理员、研发主管、研发总监、品质主管、总经理、销售总监、销售助理看全部的
|
|
|
|
|
+ if service.StringsContains(s.userInfo.Roles, "ResearchAndDevelopmentDirector") || service.StringsContains(s.userInfo.Roles, "ResearchAndDevelopmentSupervisor") || service.StringsContains(s.userInfo.Roles, "QualityAssuranceSupervisor") || service.StringsContains(s.userInfo.Roles, "GeneralManager") || service.StringsContains(s.userInfo.Roles, "SalesDirector") || service.StringsContains(s.userInfo.Roles, "SaleAssociate") || service.StringsContains(s.userInfo.Roles, "SysAdmin") {
|
|
|
// 无条件,查询全部
|
|
// 无条件,查询全部
|
|
|
// 项目经理看对应的
|
|
// 项目经理看对应的
|
|
|
} else if service.StringsContains(s.userInfo.Roles, "ProjectManager") {
|
|
} else if service.StringsContains(s.userInfo.Roles, "ProjectManager") {
|