owl-cli 6.163.0 → 6.165.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.
Files changed (3) hide show
  1. package/defaultTemplate/api/src/handlers/getHistory.jsx +2 -1
  2. package/defaultTemplate/api/src/services/modelService.jsx +1 -1
  3. package/package.json +1 -1
package/defaultTemplate/api/src/handlers/getHistory.jsx CHANGED
@@ -37,8 +37,9 @@
37
37
  if(roleId!='0' || orgId!='0'){
38
38
  finalObj = JSON.parse(JSON.stringify(obj));
39
39
  filterFields(finalObj,permissions,orgId);
40
- historyObjs.push(finalObj);
40
+
41
41
  }
42
+ historyObjs.push(finalObj);
42
43
  }
43
44
 
44
45
 
package/defaultTemplate/api/src/services/modelService.jsx CHANGED
@@ -661,7 +661,7 @@ var @projectCodeService = (function (pigeon) {
661
661
  throw {msg: '对象不存在!id=' + data.id, code: 'notFound'}
662
662
  }
663
663
  if (obj._v != data._v) {
664
- throw {code: 'concurrentupdate', msg: '对象已经修改过，本次修改被拒绝。old._v=' + obj._v + ',new._v=' + data._v}
664
+ throw {code: 'concurrentupdate', msg: '对象已经修改过，本次修改被拒绝。old._v=' + obj._v + ',new._v=' + data._v,id:obj.id}
665
665
  }
666
666
  var oldObj = JSON.parse(JSON.stringify(obj))
667
667
  //深度合并
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "owl-cli",
3
- "version": "6.163.0",
3
+ "version": "6.165.0",
4
4
  "main": "index.js",
5
5
  "preferGlobal": true,
6
6
  "bin": {