fix

center-tmtransaction/app/base/service/impl/tm/trademarktransactionSve.js

@@ -796,6 +796,8 @@ class TrademarktransactionService extends ServiceBase {
         let action = "UpdateTrademarkOnsale"
         let action = "UpdateTrademarkOnsale"
         if (["audit","fail"].includes(item.publish_status))
         if (["audit","fail"].includes(item.publish_status))
           action = "UploadTrademarkOnSale"
           action = "UploadTrademarkOnSale"
+        if (item.fail_reason === "商标属于当前用户，不需要发起强制操作")
+          action = "UpdateTrademarkOnsale"
         /*if (item.TmType !== "NORMAL"&&item.publish_status==="fail")
         /*if (item.TmType !== "NORMAL"&&item.publish_status==="fail")
           action = "UpdateTrademarkOnsale"*/
           action = "UpdateTrademarkOnsale"*/
         err = await reqbyget({
         err = await reqbyget({
@@ -909,7 +911,7 @@ class TrademarktransactionService extends ServiceBase {
     }
     }
     await this.dao.update(actionBody)
     await this.dao.update(actionBody)
     let err
     let err
-    if (actionBody.publish_status === "uppershelf")
+    // if (actionBody.publish_status === "uppershelf")
       err = await this.updateAlistatus([actionBody.id],"ON_SALE")
       err = await this.updateAlistatus([actionBody.id],"ON_SALE")
     return system.getResult(!err,err);
     return system.getResult(!err,err);
   }
   }