fix

zhiquanquan/app/base/controller/impl/trademark/trademarkCtl.js

@@ -99,15 +99,10 @@ class TrademarkCtl extends CtlBase {
                 "tm": p
                 "tm": p
             };
             };
             let uploadid;
             let uploadid;
-            if (q && q.upload_id)
+            if (q && q.upload_id) {
                 uploadid = q.upload_id;
                 uploadid = q.upload_id;
-            else {
-                let upload = await this.uploadSve.create({
-                    total: p.length
-                });
-                uploadid = upload.id;
+                body.upload_id = uploadid;
             }
             }
-            body.upload_id = uploadid;
             let rtn = await pushClient(body, pushurl, notifyurl);
             let rtn = await pushClient(body, pushurl, notifyurl);
             if (rtn.status == 1) {
             if (rtn.status == 1) {
                 let tradedb = [];
                 let tradedb = [];
@@ -152,7 +147,7 @@ class TrademarkCtl extends CtlBase {
         for (let i = 0; i < data.length; i += 200) {
         for (let i = 0; i < data.length; i += 200) {
             let pushd = data.slice(i, i + 200);
             let pushd = data.slice(i, i + 200);
             pushd.opath = p.actionBody.opath;
             pushd.opath = p.actionBody.opath;
-            pushd.user_id = p.actionBody.userid;
+            pushd.user_id = p.actionBody.user_id;
             pushd.company_id = p.actionBody.company_id;
             pushd.company_id = p.actionBody.company_id;
             await this.publish(pushd, {upload_id: uploadid})
             await this.publish(pushd, {upload_id: uploadid})
         }
         }
@@ -235,13 +230,15 @@ class TrademarkCtl extends CtlBase {
     async notify(p, q, req) {
     async notify(p, q, req) {
         console.log("=====================>接受队列消息", p);
         console.log("=====================>接受队列消息", p);
         let upload_id = p.actionBody.messageBody.upload_id;
         let upload_id = p.actionBody.messageBody.upload_id;
-        let upload = await this.uploadSve.findOne({
-            id: upload_id
-        });
-        upload.success += p.actionBody.resultInfo.data.successCount || 0;
-        upload.fail = upload.total - p.actionBody.resultInfo.data.successCount || 0;
-        upload.status = 1;
-        await upload.save();
+        if (upload_id) {//excel上传人物更新任务数据
+            let upload = await this.uploadSve.findOne({
+                id: upload_id
+            });
+            upload.success += p.actionBody.resultInfo.data.successCount || 0;
+            upload.fail = upload.total - p.actionBody.resultInfo.data.successCount || 0;
+            upload.status = 1;
+            await upload.save();
+        }
         let tradedb = p.actionBody.resultInfo.data.tm;
         let tradedb = p.actionBody.resultInfo.data.tm;
         tradedb.map(async db => {
         tradedb.map(async db => {
             await this.service.dao.model.update({
             await this.service.dao.model.update({
@@ -249,7 +246,7 @@ class TrademarkCtl extends CtlBase {
                 tm_code: db.code
                 tm_code: db.code
             }, {where: {tm_code: db.code}});
             }, {where: {tm_code: db.code}});
         });
         });
-        return system.getResult("ok")
+        return system.getResult(1,"ok")
     }
     }
 
 
     async getidlist(p, q, req) {
     async getidlist(p, q, req) {