owl-cli 6.170.0 → 6.172.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.
|
@@ -64,6 +64,7 @@ function main(){
|
|
|
64
64
|
owl_process_job_logService.add(log);
|
|
65
65
|
|
|
66
66
|
var nImported = 0;
|
|
67
|
+
var nError = 0;
|
|
67
68
|
for(var i=0; i<rows.length; i++){
|
|
68
69
|
var row = rows[i];
|
|
69
70
|
try{
|
|
@@ -75,6 +76,22 @@ function main(){
|
|
|
75
76
|
else{
|
|
76
77
|
rec = row;
|
|
77
78
|
}
|
|
79
|
+
if(!rec._orgId){
|
|
80
|
+
rec._orgId = batchImport._orgId;
|
|
81
|
+
rec._orgIds = batchImport._orgIds;
|
|
82
|
+
}
|
|
83
|
+
if(rec._orgId!=batchImport._orgId && batchImport._orgId!='0'){
|
|
84
|
+
throw "记录的_orgId不正确,应该是" + batchImport._orgId + ",实际是" + rec._orgId;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
//检查
|
|
88
|
+
var oldObj = @projectCodeService.get(rec.id);
|
|
89
|
+
if(oldObj && override!="true"){
|
|
90
|
+
throw "记录已经存在，id=" + rec.id;
|
|
91
|
+
}
|
|
92
|
+
if(oldObj && override=="true" && oldObj._orgId!=rec._orgId){
|
|
93
|
+
throw "记录的_orgId不正确,不能覆盖其他人的数据，应该是" + rec._orgId + ",实际是" + oldObj._orgId;
|
|
94
|
+
}
|
|
78
95
|
@projectCodeService.add( rec);
|
|
79
96
|
nImported++;
|
|
80
97
|
|
|
@@ -91,15 +108,29 @@ function main(){
|
|
|
91
108
|
}
|
|
92
109
|
}
|
|
93
110
|
catch(e){
|
|
111
|
+
var msg = "";
|
|
112
|
+
if(typeof e === "string"){
|
|
113
|
+
msg = e;
|
|
114
|
+
}
|
|
115
|
+
else{
|
|
116
|
+
msg = e.msg;
|
|
117
|
+
if(!msg && e.getCause){
|
|
118
|
+
msg = e.getCause();
|
|
119
|
+
}
|
|
120
|
+
}
|
|
94
121
|
var now = new Date().getTime();
|
|
95
122
|
var log = {
|
|
96
123
|
objId:batchImport.id,
|
|
97
124
|
startTime:now,
|
|
98
125
|
endTime:now,
|
|
99
126
|
name:"批量导入" + batchImport.id,
|
|
100
|
-
remark:"错误记录，行号" + i + ",内容:" + row
|
|
127
|
+
remark:"错误记录，行号" + i + ",内容:" + row + ",错误信息:" + msg
|
|
101
128
|
}
|
|
102
129
|
owl_process_job_logService.add(log);
|
|
130
|
+
nError++;
|
|
131
|
+
if(nError==50){
|
|
132
|
+
throw "错误记录超过50条，停止导入";
|
|
133
|
+
}
|
|
103
134
|
}
|
|
104
135
|
}
|
|
105
136
|
|
|
@@ -122,6 +153,9 @@ function main(){
|
|
|
122
153
|
}
|
|
123
154
|
else{
|
|
124
155
|
msg = e.msg;
|
|
156
|
+
if(!msg && e.getCause){
|
|
157
|
+
msg = e.getCause();
|
|
158
|
+
}
|
|
125
159
|
}
|
|
126
160
|
var now = new Date().getTime();
|
|
127
161
|
var log = {
|