Merge branch 'igirl-channel-web' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel-web

igirl-channel-web/app/base/controller/impl/trademark/tmqueryCtl.js

@@ -14,17 +14,17 @@ class tmqueryCtl extends CtlBase {
     };
     };
   }
   }
   async doPost(pobj, obj, req) {
   async doPost(pobj, obj, req) {
-    if (["subTmOrder", "getTmOrderList", "getTmOrderInfo", "getTmApplyInfo", "getTmNclList",
+    if (["subOtherOrder", "subTmOrder", "getTmOrderList", "getTmOrderInfo", "getTmApplyInfo", "getTmNclList",
       "getNeedInfo", "tmConfirm", "updateTmInfo", "updateNclInfo",
       "getNeedInfo", "tmConfirm", "updateTmInfo", "updateNclInfo",
       "updateContacts", "updateCustomerInfo"].indexOf(pobj.actionType) >= 0) {
       "updateContacts", "updateCustomerInfo"].indexOf(pobj.actionType) >= 0) {
       if (!pobj.actionBody.channelUserId) {
       if (!pobj.actionBody.channelUserId) {
-        return system.getResult(null, "verify channelUserId is not empty");
+        return system.getResult(-99, "verify channelUserId is not empty");
       }
       }
       if (!req.session.userPinInfo) {
       if (!req.session.userPinInfo) {
-        return system.getResult(null, "user is not login");
+        return system.getResult(-99, "user is not login");
       }
       }
       if (req.session.userPinInfo.encryptChannelUserId != pobj.actionBody.channelUserId) {
       if (req.session.userPinInfo.encryptChannelUserId != pobj.actionBody.channelUserId) {
-        return system.getResult(null, "user login is error");
+        return system.getResult(-99, "user login is error");
       }
       }
       pobj.isDecryptUser = "yes";
       pobj.isDecryptUser = "yes";
     }
     }