owl-cli 7.26.0 → 7.28.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.
|
@@ -61,12 +61,13 @@
|
|
|
61
61
|
}
|
|
62
62
|
else {
|
|
63
63
|
modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
|
|
64
|
+
modelObject._orgId = orgId;
|
|
64
65
|
//修复_orgIds
|
|
65
|
-
var _orgIds = [];
|
|
66
|
+
var _orgIds = [orgId];
|
|
66
67
|
if(modelObject._orgIds){
|
|
67
68
|
modelObject._orgIds.forEach(function(orgId){
|
|
68
69
|
if(typeof orgId === 'string'){
|
|
69
|
-
|
|
70
|
+
//过滤重复的orgId
|
|
70
71
|
if(_orgIds.indexOf(orgId)===-1){
|
|
71
72
|
_orgIds.push(orgId);
|
|
72
73
|
}
|
|
@@ -83,9 +84,15 @@
|
|
|
83
84
|
if(roleId!=='internal' && roleId!='0') {
|
|
84
85
|
checkUpdatePermission(modelObject, diffResult, permissions, orgId);
|
|
85
86
|
}
|
|
87
|
+
// if(modelObject._v === -1){
|
|
88
|
+
// modelObject._v = oldObj._v;
|
|
89
|
+
// }
|
|
90
|
+
|
|
86
91
|
var merged = merge(oldObj,modelObject,permissions,orgId);
|
|
87
92
|
|
|
88
93
|
merged.owl_lastModifiedUserId = env.loginUserId;
|
|
94
|
+
merged._orgId = orgId;
|
|
95
|
+
|
|
89
96
|
var newdata = @projectCodeService.update( merged,env);
|
|
90
97
|
}
|
|
91
98
|
|
|
@@ -148,7 +148,10 @@ var @projectCodeService = (function (pigeon) {
|
|
|
148
148
|
}
|
|
149
149
|
if (v.indexOf('$') == 0) {
|
|
150
150
|
var fullkey = v.substring(1)
|
|
151
|
-
|
|
151
|
+
var newValue = f.getValue(fullkey, env);
|
|
152
|
+
if(newValue){
|
|
153
|
+
return newValue;
|
|
154
|
+
}
|
|
152
155
|
}
|
|
153
156
|
return v
|
|
154
157
|
},
|