owl-cli 5.41.0 → 5.44.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.
|
@@ -39,7 +39,7 @@ function checklogin(){
|
|
|
39
39
|
var loginUserId = session.userId
|
|
40
40
|
var roleId = session.role;
|
|
41
41
|
var orgId = session.orgId;
|
|
42
|
-
var orgIds = getParentOrgIds(orgId);
|
|
42
|
+
var orgIds = [orgId].concat(getParentOrgIds(orgId));
|
|
43
43
|
if(loginUserId){
|
|
44
44
|
var env = {
|
|
45
45
|
now: new Date().getTime(),
|
|
@@ -45,17 +45,13 @@
|
|
|
45
45
|
//adding
|
|
46
46
|
if(!modelObject._orgId){
|
|
47
47
|
modelObject._orgId = orgId;
|
|
48
|
-
modelObject._orgIds = orgIds;
|
|
49
48
|
}
|
|
50
|
-
|
|
51
|
-
modelObject._orgIds = getParentOrgIds(orgId);
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
|
|
49
|
+
modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
|
|
55
50
|
modelObject.m = env.m;
|
|
56
51
|
var newdata = @projectCodeService.add( modelObject,env );
|
|
57
52
|
}
|
|
58
53
|
else {
|
|
54
|
+
modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
|
|
59
55
|
var newdata = @projectCodeService.update( modelObject,env);
|
|
60
56
|
}
|
|
61
57
|
|
|
@@ -591,10 +591,11 @@ var @projectCodeService = (function (pigeon) {
|
|
|
591
591
|
|
|
592
592
|
del: function (id) {
|
|
593
593
|
//只做软删除
|
|
594
|
-
var data = f.get(id)
|
|
594
|
+
var data = f.get(id,true)
|
|
595
595
|
if (!data) {
|
|
596
596
|
throw '对象不存在!id=' + id
|
|
597
597
|
}
|
|
598
|
+
data.id = id;
|
|
598
599
|
var key = pigeon.getRKey(data['owl_createTime'], 13)
|
|
599
600
|
pigeon.deleteFromList(f.getAllListName(), key, id)
|
|
600
601
|
if (data['subplatformId']) {
|