owl-cli 6.57.0 → 6.59.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.
|
@@ -29,13 +29,13 @@ function main(){
|
|
|
29
29
|
pageId:'tasks/exportWithTemplateTask.jsx',
|
|
30
30
|
state:'notstart',
|
|
31
31
|
params:JSON.stringify({
|
|
32
|
-
|
|
32
|
+
id:id,
|
|
33
33
|
templateId:templateId
|
|
34
34
|
})
|
|
35
35
|
};
|
|
36
36
|
owl_task_infoService.add(taskInfo);
|
|
37
37
|
var taskInfoId = taskInfo.id;
|
|
38
|
-
|
|
38
|
+
JobsService.submitExportTask('@projectCode', 'tasks/exportWithTemplateTask.jsx',{
|
|
39
39
|
id:id,
|
|
40
40
|
templateId:templateId,
|
|
41
41
|
taskInfoId:"" + taskInfoId
|
|
@@ -43,7 +43,7 @@ function main(){
|
|
|
43
43
|
|
|
44
44
|
var ret = {
|
|
45
45
|
state:'ok',
|
|
46
|
-
taskInfoId :
|
|
46
|
+
taskInfoId : taskInfoId
|
|
47
47
|
}
|
|
48
48
|
|
|
49
49
|
out.print(JSON.stringify(ret));
|
|
@@ -30,7 +30,20 @@ function checklogin() {
|
|
|
30
30
|
allowed_appIds: ["*"]
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
|
|
33
|
+
var env = {
|
|
34
|
+
now: new Date().getTime(),
|
|
35
|
+
loginUserId: 'internal',
|
|
36
|
+
loginId: 'internal',
|
|
37
|
+
loginUser:user,
|
|
38
|
+
shopId: m,
|
|
39
|
+
warehouseId: "",
|
|
40
|
+
roleId: 'internal',
|
|
41
|
+
orgId: 'internal',
|
|
42
|
+
orgIds: 'internal',
|
|
43
|
+
m: m
|
|
44
|
+
}
|
|
45
|
+
return env;
|
|
46
|
+
|
|
34
47
|
} else {
|
|
35
48
|
var isid = SessionService.getSessionId(request);
|
|
36
49
|
var now = new Date().getTime();
|
|
@@ -326,6 +339,7 @@ function checkUpdatePermission(data,diffresult,permissions,orgId){
|
|
|
326
339
|
}
|
|
327
340
|
}
|
|
328
341
|
//啥都不做代表检查通过
|
|
342
|
+
//TODO:检查用户权限
|
|
329
343
|
}
|
|
330
344
|
|
|
331
345
|
function filterFields(data, permissions, orgId) {
|
|
@@ -54,13 +54,18 @@
|
|
|
54
54
|
modelObject.m = env.m;
|
|
55
55
|
|
|
56
56
|
//如果检查不通过，则会抛出异常
|
|
57
|
-
|
|
57
|
+
if(roleId!=='internal'){
|
|
58
|
+
checkPermission(modelObject,permissions,orgId,"add");
|
|
59
|
+
}
|
|
60
|
+
|
|
58
61
|
var newdata = @projectCodeService.add( modelObject,env );
|
|
59
62
|
}
|
|
60
63
|
else {
|
|
61
64
|
modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
|
|
62
65
|
diffResult = diff(oldObj,modelObject,"");
|
|
63
|
-
|
|
66
|
+
if(roleId!=='internal') {
|
|
67
|
+
checkUpdatePermission(modelObject, diffResult, permissions, orgId);
|
|
68
|
+
}
|
|
64
69
|
var merged = merge(oldObj,modelObject,permissions,orgId);
|
|
65
70
|
var newdata = @projectCodeService.update( merged,env);
|
|
66
71
|
}
|