owl-cli 6.173.0 → 6.175.0

package/defaultTemplate/api/src/services/modelService.jsx

@@ -553,12 +553,13 @@ var @projectCodeService = (function (pigeon) {
             data['_t'] = spec['_t']
             try {
                 var meta = spec['#meta'];
-                if(meta.isTree){
-                    f.updateParentPath(data);
-                }
+
 
                 EventBusService.fire(spec['_t'] + '_add_before', {data: data, env: env})
                 data.id = f.getId(data)
+                if(meta.isTree){
+                    f.updateParentPath(data);
+                }
                 pigeon.lock(f.getLock(data))
                 f.saveUniqueFields(data, env)
                 pigeon.saveObject(data.id, data)

package/defaultTemplate/api/src/tasks/doBatchImport.jsx

@@ -86,10 +86,10 @@ function main(){
 
                 //检查
                 var oldObj = @projectCodeService.get(rec.id);
-                if(oldObj && batchImport.override!="true"){
+                if(oldObj && !batchImport.override){
                     throw "记录已经存在，id=" + rec.id;
                 }
-                if(oldObj && batchImport.override=="true" && oldObj._orgId!=rec._orgId){
+                if(oldObj && batchImport.override==true && oldObj._orgId!=rec._orgId){
                     throw "记录的_orgId不正确,不能覆盖其他人的数据，应该是" + rec._orgId + ",实际是" + oldObj._orgId;
                 }
             @projectCodeService.add( rec);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "owl-cli",
-  "version": "6.173.0",
+  "version": "6.175.0",
   "main": "index.js",
   "preferGlobal": true,
   "bin": {