|
|
@@ -82,7 +82,11 @@ func (s DeliverOrderProgressService) List(ctx context.Context, req *work.Deliver
|
|
|
}
|
|
|
|
|
|
if req.IsPrincipalPerson == "1" {
|
|
|
- dao = dao.Where("principal_person_id = ?", s.userInfo.Id)
|
|
|
+ if service.StringsContains(s.userInfo.Roles, "SysAdmin") || service.StringsContains(s.userInfo.Roles, "GeneralManager") || service.StringsContains(s.userInfo.Roles, "ResearchAndDevelopmentDirector") {
|
|
|
+ // 无条件,查询全部
|
|
|
+ } else {
|
|
|
+ dao = dao.Where("principal_person_id = ?", s.userInfo.Id)
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
total, err := dao.Count()
|