|
|
@@ -144,11 +144,11 @@ func (s *UserService) GetDataScope(userInfo *request.UserInfo) (dataScope g.Map,
|
|
|
}
|
|
|
|
|
|
// 地区数据权限
|
|
|
- regionSrv, _ := NewRegionService(s.Ctx)
|
|
|
- regionList, err := regionSrv.getCurrentUserRegionAuth(userId)
|
|
|
- if err != nil {
|
|
|
- return nil, err
|
|
|
- }
|
|
|
+ //regionSrv, _ := NewRegionService(s.Ctx)
|
|
|
+ //regionList, err := regionSrv.getCurrentUserRegionAuth(userId)
|
|
|
+ //if err != nil {
|
|
|
+ // return nil, err
|
|
|
+ //}
|
|
|
|
|
|
// 获取角色
|
|
|
roles, err := s.GetMaxRoleDataScopeByUser(userId)
|
|
|
@@ -206,7 +206,8 @@ func (s *UserService) GetDataScope(userInfo *request.UserInfo) (dataScope g.Map,
|
|
|
if userIdArr.Size() == 0 {
|
|
|
userIdArr.Add(userId)
|
|
|
}
|
|
|
- dataScope = g.Map{"userIds": userIdArr.Slice(), "cust_city_id": regionList, "product_line": productLineList}
|
|
|
+ //dataScope = g.Map{"userIds": userIdArr.Slice(), "cust_city_id": regionList, "product_line": productLineList}
|
|
|
+ dataScope = g.Map{"userIds": userIdArr.Slice(), "product_line": productLineList}
|
|
|
if isBigProject != "" {
|
|
|
dataScope["is_big"] = isBigProject
|
|
|
}
|