owl-cli 6.59.0 → 6.61.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.
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
|
|
18
18
|
|
|
19
19
|
var orgId = env.orgId;
|
|
20
|
+
var roleId = env.roleId;
|
|
20
21
|
var orgIds = env.orgIds;
|
|
21
22
|
|
|
22
23
|
var params = JSON.parse($body);
|
|
@@ -38,7 +39,7 @@
|
|
|
38
39
|
out.print(JSON.stringify(ret));
|
|
39
40
|
return;
|
|
40
41
|
}
|
|
41
|
-
if(orgId && oldObj._orgIds && oldObj._orgIds){
|
|
42
|
+
if(roleId!=='internal' && orgId && oldObj._orgIds && oldObj._orgIds){
|
|
42
43
|
//检查是否有权限修改
|
|
43
44
|
if(orgId!='0' && oldObj._orgIds.indexOf(orgId)===-1){
|
|
44
45
|
var ret = {
|
|
@@ -127,8 +127,18 @@ function diff(obj1, obj2,parentKeys){
|
|
|
127
127
|
obj2 = {};
|
|
128
128
|
}
|
|
129
129
|
|
|
130
|
+
if(typeof v2==='string'){
|
|
131
|
+
result.push({
|
|
132
|
+
type:'changed',
|
|
133
|
+
fieldKey : parentKeys,
|
|
134
|
+
parentKeys: "",
|
|
135
|
+
oldv : '' + JSON.stringify(v1),
|
|
136
|
+
newv : '' + v2
|
|
137
|
+
});
|
|
138
|
+
}
|
|
130
139
|
var keys1 = Object.keys(obj1);
|
|
131
140
|
var keys2 = Object.keys(obj2);
|
|
141
|
+
|
|
132
142
|
keys1.sort();
|
|
133
143
|
keys2.sort();
|
|
134
144
|
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
var roleId = env.roleId
|
|
33
33
|
if(orgId && oldObj && oldObj._orgIds){
|
|
34
34
|
//检查是否有权限修改
|
|
35
|
-
if(orgId!='0' && oldObj._orgIds.indexOf(orgId)===-1){
|
|
35
|
+
if(roleId!=='internal' && orgId!='0' && oldObj._orgIds.indexOf(orgId)===-1){
|
|
36
36
|
var ret = {
|
|
37
37
|
state:'err',
|
|
38
38
|
code: 'no permission',
|