owl-cli 6.199.0 → 6.201.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.
|
@@ -271,16 +271,23 @@ function checkPermission(data, permissions, orgId, action) {
|
|
|
271
271
|
var ef_section_permissions = null;
|
|
272
272
|
var ef_field_permissions = null;
|
|
273
273
|
var ef_table_permissions = null;
|
|
274
|
-
if
|
|
274
|
+
if(data){
|
|
275
|
+
if (data._orgId === orgId) {
|
|
276
|
+
ef_section_permissions = section_permissions.same_org;
|
|
277
|
+
ef_field_permissions = field_permissions.same_org;
|
|
278
|
+
ef_table_permissions = table_permissions.same_org;
|
|
279
|
+
} else {
|
|
280
|
+
if(isSubOrg(data,orgId)) {
|
|
281
|
+
ef_section_permissions = section_permissions.sub_org;
|
|
282
|
+
ef_field_permissions = field_permissions.sub_org;
|
|
283
|
+
ef_table_permissions = table_permissions.sub_org;
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
else{
|
|
275
288
|
ef_section_permissions = section_permissions.same_org;
|
|
276
289
|
ef_field_permissions = field_permissions.same_org;
|
|
277
290
|
ef_table_permissions = table_permissions.same_org;
|
|
278
|
-
} else {
|
|
279
|
-
if(isSubOrg(data,orgId)) {
|
|
280
|
-
ef_section_permissions = section_permissions.sub_org;
|
|
281
|
-
ef_field_permissions = field_permissions.sub_org;
|
|
282
|
-
ef_table_permissions = table_permissions.sub_org;
|
|
283
|
-
}
|
|
284
291
|
}
|
|
285
292
|
|
|
286
293
|
if(!ef_table_permissions){
|
|
@@ -296,10 +303,13 @@ function checkPermission(data, permissions, orgId, action) {
|
|
|
296
303
|
if(ef_table_permissions.update !== 'allowed' && action==='update'){
|
|
297
304
|
throw "表没有删除记录权限。"
|
|
298
305
|
}
|
|
299
|
-
if(ef_table_permissions.read !== '
|
|
306
|
+
if(ef_table_permissions.read !== 'allowed' && action==='read'){
|
|
300
307
|
throw "表没有读取权限。"
|
|
301
308
|
}
|
|
302
|
-
if(ef_table_permissions.list !== '
|
|
309
|
+
if(ef_table_permissions.list !== 'allowed' && action==='list'){
|
|
310
|
+
throw "表没有列出权限。"
|
|
311
|
+
}
|
|
312
|
+
if(ef_table_permissions.listall !== 'allowed' && action==='listall'){
|
|
303
313
|
throw "表没有列出权限。"
|
|
304
314
|
}
|
|
305
315
|
//检查section_permission
|
|
@@ -344,6 +354,7 @@ function checkUpdatePermission(data,diffresult,permissions,orgId){
|
|
|
344
354
|
var ef_section_permissions = null;
|
|
345
355
|
var ef_field_permissions = null;
|
|
346
356
|
var ef_table_permissions = null;
|
|
357
|
+
|
|
347
358
|
if (data._orgId === orgId) {
|
|
348
359
|
ef_section_permissions = section_permissions.same_org;
|
|
349
360
|
ef_field_permissions = field_permissions.same_org;
|