owl-cli 6.3.0 → 6.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -38,14 +38,13 @@ function checklogin(){
|
|
|
38
38
|
var session = owl_backend_sessionService.get(sessionId);
|
|
39
39
|
if(session && session.lastModified > now - 7*24*3600*1000){
|
|
40
40
|
var loginUserId = session.userId
|
|
41
|
-
var roleId = session.
|
|
41
|
+
var roleId = session.roleId;
|
|
42
42
|
var orgId = session.orgId;
|
|
43
43
|
var orgIds = [orgId].concat(getParentOrgIds(orgId));
|
|
44
44
|
if(loginUserId){
|
|
45
45
|
var env = {
|
|
46
46
|
now: new Date().getTime(),
|
|
47
47
|
loginId: loginUserId,
|
|
48
|
-
roleId:roleId,
|
|
49
48
|
shopId:m,
|
|
50
49
|
warehouseId:"",
|
|
51
50
|
roleId:roleId,
|
|
@@ -137,12 +137,6 @@ function buildSort(sort){
|
|
|
137
137
|
|
|
138
138
|
var filters = getFilters();
|
|
139
139
|
|
|
140
|
-
if(roleId){
|
|
141
|
-
var tablePermission = getTablePermission("owl_wh_receipt",loginId,roleId);
|
|
142
|
-
if(tablePermission && tablePermission.filters){
|
|
143
|
-
filters = filters.concat(tablePermission.filters);
|
|
144
|
-
}
|
|
145
|
-
}
|
|
146
140
|
|
|
147
141
|
if(recycleBin){
|
|
148
142
|
filters.push({"term":{"del.keyword":"T"}});
|