tj

fqboss/app/base/api/impl/beehive.js

@@ -46,7 +46,7 @@ class beehiveApi extends ApiBase{
      }
      }
      sql =sql+" group by 	tmc.credit_code, tmc.applier, att.`name` "
      sql =sql+" group by 	tmc.credit_code, tmc.applier, att.`name` "
 
 
-     var sql2 = "select count(*) count from ("+sql+") as a";
+     var sql2 = "select count(1) count from ("+sql+") as a";
      console.log(sql2);
      console.log(sql2);
      sql = sql + " limit "+start+","+ps;
      sql = sql + " limit "+start+","+ps;
      console.log(sql);
      console.log(sql);

fqboss/app/base/db/impl/trademarkDao.js

@@ -8,42 +8,45 @@ class TrademarkDao extends Dao {
   constructor() {
   constructor() {
     super(Dao.getModelName(TrademarkDao));
     super(Dao.getModelName(TrademarkDao));
   }
   }
-  judgeChannelCode(channelcode){//判断渠道编码是否为igirl-channel渠道，若是返回渠道码对应商标来源类型
-    if(!channelCodeToTmSourceType || !channelcode){
+  judgeChannelCode(channelcode) {//判断渠道编码是否为igirl-channel渠道，若是返回渠道码对应商标来源类型
+    if (!channelCodeToTmSourceType || !channelcode) {
       return null;
       return null;
     }
     }
-    if(channelCodeToTmSourceType.hasOwnProperty(channelcode)){
+    if (channelCodeToTmSourceType.hasOwnProperty(channelcode)) {
       return channelCodeToTmSourceType[channelcode];
       return channelCodeToTmSourceType[channelcode];
-    }else{
+    } else {
       return null;
       return null;
     }
     }
   }
   }
-  judgeTmSourceType(type){//判断商标来源类型是否为igirl-channel来源，若是返回来源类型对应渠道码
-    if(!tmSourceTypeToChannelCode || !type){
+  judgeTmSourceType(type) {//判断商标来源类型是否为igirl-channel来源，若是返回来源类型对应渠道码
+    if (!tmSourceTypeToChannelCode || !type) {
       return null;
       return null;
     }
     }
-    if(tmSourceTypeToChannelCode.hasOwnProperty(type)){
+    if (tmSourceTypeToChannelCode.hasOwnProperty(type)) {
       return tmSourceTypeToChannelCode[type];
       return tmSourceTypeToChannelCode[type];
-    }else{
+    } else {
       return null;
       return null;
     }
     }
   }
   }
   extraWhere(obj, w) {
   extraWhere(obj, w) {
     if (obj.codepath && obj.codepath != "") {
     if (obj.codepath && obj.codepath != "") {
-      if (obj.codepath.indexOf("alltrademark") < 0  && obj.codepath.indexOf("allfqtm")<0) {
-        // w["user_id"]=obj.uid;--改成当前登录者的onlyCode进行查不同平台的用户提报的商标数据
-        // w["onlyCode"] = obj.onlyCode;
-        w[this.db.Op.or] = [
-          { [this.db.Op.and]: [{ onlyCode: obj.onlyCode }] },
-          { [this.db.Op.and]: [{ mobile: obj.mobile }] },
-        ];
+      if (obj.codepath.indexOf("alltrademark") < 0 && obj.codepath.indexOf("allfqtm") < 0) {
+        //  改成当前登录者的onlyCode进行查不同平台的用户提报的商标数据
+        var whereArray = [];
+        if (obj.onlyCode) {
+          whereArray.push({ [this.db.Op.and]: [{ onlyCode: obj.onlyCode }] });
+        }
+        if (obj.mobile) {
+          whereArray.push({ [this.db.Op.and]: [{ mobile: obj.mobile }] });
+        }
+        if (obj.uid) {
+          whereArray.push({ [this.db.Op.and]: [{ user_id: obj.uid }] });
+        }
+        w[this.db.Op.or] = whereArray;
       }
       }
-      else {//----平台的运营人员可以看全部的商标信息
+      else {
+        //----平台的运营人员可以看全部的商标信息
         w["channelPayStatus"] = "yzf";
         w["channelPayStatus"] = "yzf";
-        // w[this.db.Op.or] = [
-        //   { [this.db.Op.and]: [{ tmSourceType: "8" }] },
-        //   { [this.db.Op.and]: [{ tmSourceType: "16" }] },
-        // ];
       }
       }
     }
     }
     return w;
     return w;

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

@@ -66,7 +66,7 @@ class AccountService extends ServiceBase{
       topNum=100;
       topNum=100;
     }
     }
     var sql="SELECT userName,nickName,onlyCode,pvCount,headUrl FROM p_account AS a RIGHT JOIN"+
     var sql="SELECT userName,nickName,onlyCode,pvCount,headUrl FROM p_account AS a RIGHT JOIN"+
-            " (SELECT referrerOnlyCode AS onlyCode,COUNT(*) AS pvCount FROM p_account WHERE referrerOnlyCode!='' AND "+
+            " (SELECT referrerOnlyCode AS onlyCode,COUNT(1) AS pvCount FROM p_account WHERE referrerOnlyCode!='' AND "+
             " referrerOnlyCode IS NOT NULL GROUP BY referrerOnlyCode ORDER BY pvCount DESC LIMIT 0,:tmpTopNum) AS b"+
             " referrerOnlyCode IS NOT NULL GROUP BY referrerOnlyCode ORDER BY pvCount DESC LIMIT 0,:tmpTopNum) AS b"+
             " ON a.`unionId`=b.onlyCode ORDER BY pvCount DESC";
             " ON a.`unionId`=b.onlyCode ORDER BY pvCount DESC";
     var paras={tmpTopNum:topNum};
     var paras={tmpTopNum:topNum};

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

@@ -79,7 +79,7 @@ class StatisticalRateService extends ServiceBase{
             addUpValue:kdfm==0?0:parseFloat(kdfz)/parseFloat(kdfm)//累计值
             addUpValue:kdfm==0?0:parseFloat(kdfz)/parseFloat(kdfm)//累计值
         });
         });
         //用户分裂率  ,sql查询返回的值为：[ { tjCount: 0 } ]
         //用户分裂率  ,sql查询返回的值为：[ { tjCount: 0 } ]
-        var flfz=await this.accountDao.customQuery("SELECT COUNT(*) tjCount FROM `p_account` WHERE referrerOnlyCode IS NOT NULL");
+        var flfz=await this.accountDao.customQuery("SELECT COUNT(1) tjCount FROM `p_account` WHERE referrerOnlyCode IS NOT NULL");
         addList.push({
         addList.push({
             createTime:tTime,
             createTime:tTime,
             totalType:'yhfll',
             totalType:'yhfll',

fqboss/app/config/localsettings.js

@@ -7,14 +7,15 @@ var settings={
   },
   },
   database:{
   database:{
     dbname : "fqboss",
     dbname : "fqboss",
-    // user: "write",
-    // password: "write",
-    user: "root",
-    password: "root",
+    user: "write",
+    password: "write",
+    // user: "root",
+    // password: "root",
     config: {
     config: {
-      host: '121.36.3.35',
-      // host: '192.168.18.237',
-      port: 3306,
+      // host: '121.36.3.35',
+      host: '43.247.184.35',
+      // port: 3306,
+      port: 8899,
       dialect: 'mysql',
       dialect: 'mysql',
         operatorsAliases: false,
         operatorsAliases: false,
         pool: {
         pool: {