Merge branch 'gsb-marketplat' of gitlab.gongsibao.com:jiangyong/zhichan into gsb-marketplat

gsb-marketplat/app/base/api/impl/action/mediaaggregation.js

@@ -28,9 +28,9 @@ class Mediaaggregation extends APIBase {
         var self = this;
         var self = this;
         pobj.xctx = req.xctx;
         pobj.xctx = req.xctx;
         pobj.clientIp = req.clientIp;
         pobj.clientIp = req.clientIp;
-        if (pobj.company_id) {
-            pobj["actionBody"]["company_id"] = pobj.company_id || "10";
-        }
+        // if (pobj.company_id) {
+        //     pobj["actionBody"]["company_id"] = pobj.company_id || "10";
+        // }
         switch (action_type) {
         switch (action_type) {
             case "test"://测试
             case "test"://测试
                 opResult = system.getResultSuccess("测试接口");
                 opResult = system.getResultSuccess("测试接口");

gsb-marketplat/app/base/db/impl/configmag/imginfoDao.js

@@ -7,7 +7,7 @@ class ImginfoDao extends Dao{
   extraWhere(qobj, qw, qc) {
   extraWhere(qobj, qw, qc) {
     console.log(qobj)
     console.log(qobj)
     if(!qobj.company_id){
     if(!qobj.company_id){
-      qw["company_id"] = "";
+      // qw["company_id"] = "";
     }else{
     }else{
       qw["company_id"] = Number(qobj.company_id);
       qw["company_id"] = Number(qobj.company_id);
     }
     }

gsb-marketplat/app/base/db/impl/media/needinfoDao.js

@@ -18,12 +18,12 @@ class NeedinfoDao extends Dao{
       total: 0,//总记录条数
       total: 0,//总记录条数
       rows: []
       rows: []
     };
     };
-    var sql = "select id,p_id,p_code,p_name,code,name,pic_url,jump_link_type,jump_link,sequence from mc_product_type  where deleted_at is null and p_id = 0 and company_id = :company_id order by sequence desc ";
+    var sql = "select id,p_id,p_code,p_name,code,name,pic_url,jump_link_type,jump_link,sequence from mc_product_type  where deleted_at is null and p_id = 0 order by sequence asc ";
 
 
     var list = await this.customQuery(sql, params);
     var list = await this.customQuery(sql, params);
     for(var i=0;i<list.length;i++){
     for(var i=0;i<list.length;i++){
       if(list[i] && list[i].id)
       if(list[i] && list[i].id)
-      var sql2 = "select id,p_id,p_code,p_name,code,name,pic_url,sequence from mc_product_type  where deleted_at is null and p_id = "+list[i].id+" and company_id = :company_id order by sequence desc ";
+      var sql2 = "select id,p_id,p_code,p_name,code,name,pic_url,sequence from mc_product_type  where deleted_at is null and p_id = "+list[i].id+" order by sequence desc ";
       var childlist = await this.customQuery(sql2, params);
       var childlist = await this.customQuery(sql2, params);
       list[i].children = childlist;
       list[i].children = childlist;
     }
     }

gsb-marketplat/app/base/service/impl/media/needinfoSve.js

@@ -69,6 +69,7 @@ class NeedinfoService extends ServiceBase {
                     "pushUrl": "https://mmc.gongsibao.com/external/action/template/springBoard",// Y 推送地址
                     "pushUrl": "https://mmc.gongsibao.com/external/action/template/springBoard",// Y 推送地址
                     "actionType": "pushAggregationNeedInfo2fq",// Y 推送地址接收时的功能名称               
                     "actionType": "pushAggregationNeedInfo2fq",// Y 推送地址接收时的功能名称               
                     "identifyCode": "marketmedia-pushneed2fq",// Y 操作的业务标识
                     "identifyCode": "marketmedia-pushneed2fq",// Y 操作的业务标识
+                    "headData":{"xappkey": "f6b59b74-f943-4735-bb86-e05d6b7fdwsv"}, //N 请求头信息，Json格式，如：{token:"XXXXXXX"}
                     "messageBody": { // Y 推送的业务消息，必须有一项对象属性值
                     "messageBody": { // Y 推送的业务消息，必须有一项对象属性值
                         "id": id
                         "id": id
                     }
                     }

gsb-marketplat/app/config/settings.js

@@ -16,7 +16,7 @@ var settings = {
   salt: "%iatpD1gcxz7iF#B",
   salt: "%iatpD1gcxz7iF#B",
   defaultpwd: "gsb2020",
   defaultpwd: "gsb2020",
   basepath: path.normalize(path.join(__dirname, '../..')),
   basepath: path.normalize(path.join(__dirname, '../..')),
-  port: process.env.NODE_PORT || 8003,
+  port: process.env.NODE_PORT || 8002,
   logindex: "center_manage",
   logindex: "center_manage",
   appname: "gsb_marketplat",
   appname: "gsb_marketplat",
   kongurl: function () { if (this.env == "dev") { var localsettings = require("./localsettings"); return localsettings.kongurl; } else { return ENVINPUT.KONG_ADMIAN; } },
   kongurl: function () { if (this.env == "dev") { var localsettings = require("./localsettings"); return localsettings.kongurl; } else { return ENVINPUT.KONG_ADMIAN; } },