giMerge branch 'fqboss' of gitlab.gongsibao.com:jiangyong/zhichan into fqboss

fqboss/app/base/service/impl/orderSve.js

@@ -1608,7 +1608,7 @@ class OrderService extends ServiceBase {
       var selectNclThreeCount = 0;
       var selectNclThreeCount = 0;
       for (let index = 0; index < nclones.length; index++) {
       for (let index = 0; index < nclones.length; index++) {
         const element = nclones[index];
         const element = nclones[index];
-        if(element.code && oldNclOneCodes.length>0 && tm.tmFormType && tm.tmFormType=="3"){
+        if(element.code && oldNclOneCodes.length>0){
           if(oldNclOneCodes.indexOf(element.code)>=0){
           if(oldNclOneCodes.indexOf(element.code)>=0){
             return { code: "-260", msg: "已存在第" + element.code + "类的商标，不能重复提交" };
             return { code: "-260", msg: "已存在第" + element.code + "类的商标，不能重复提交" };
           }
           }