owl-cli 6.129.0 → 6.130.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.
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
var roleId = env.roleId
|
|
33
33
|
if(orgId && oldObj && oldObj._orgIds){
|
|
34
34
|
//检查是否有权限修改
|
|
35
|
-
if(roleId!=='internal' && orgId!='0' && oldObj._orgIds.indexOf(orgId)===-1){
|
|
35
|
+
if(roleId!=='internal' && roleId!='0' && orgId!='0' && oldObj._orgIds.indexOf(orgId)===-1){
|
|
36
36
|
var ret = {
|
|
37
37
|
state:'err',
|
|
38
38
|
code: 'no permission',
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
modelObject.m = env.m;
|
|
55
55
|
|
|
56
56
|
//如果检查不通过，则会抛出异常
|
|
57
|
-
if(roleId!=='internal'){
|
|
57
|
+
if(roleId!=='internal' && roleId!='0'){
|
|
58
58
|
checkPermission(modelObject,permissions,orgId,"add");
|
|
59
59
|
}
|
|
60
60
|
modelObject.owl_createUserId = env.loginUserId;
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
}
|
|
82
82
|
modelObject._orgIds = _orgIds;
|
|
83
83
|
diffResult = diff(oldObj,modelObject,"");
|
|
84
|
-
if(roleId!=='internal') {
|
|
84
|
+
if(roleId!=='internal' && roleId!='0') {
|
|
85
85
|
checkUpdatePermission(modelObject, diffResult, permissions, orgId);
|
|
86
86
|
}
|
|
87
87
|
var merged = merge(oldObj,modelObject,permissions,orgId);
|