gsb

bpo-stat/app/base/controller/impl/all/merchantCtl.js

@@ -4,12 +4,10 @@ const CtlBase = require("../../ctl.base");
 class MerchantCtl extends CtlBase {
 class MerchantCtl extends CtlBase {
     constructor() {
     constructor() {
         super("all", CtlBase.getServiceName(MerchantCtl));
         super("all", CtlBase.getServiceName(MerchantCtl));
-        this.body = "智薪云公司1";
     }
     }
 
 
     async allList(qobj){
     async allList(qobj){
         var params = qobj.search || {};
         var params = qobj.search || {};
-        params.sign_body = this.body;
         this.doTimeCondition(params, ["signBegin", "signEnd"]);
         this.doTimeCondition(params, ["signBegin", "signEnd"]);
         try {
         try {
             var page = await this.service.signPage(params);
             var page = await this.service.signPage(params);

bpo-stat/app/base/db/models/auth/user.js

@@ -5,10 +5,9 @@ module.exports = (db, DataTypes) => {
     return db.define("user", {
     return db.define("user", {
         userName: DataTypes.STRING,
         userName: DataTypes.STRING,
         password: DataTypes.STRING,
         password: DataTypes.STRING,
-        mobile: DataTypes.INTEGER,
-        nickName: DataTypes.INTEGER,
-        mobile: DataTypes.INTEGER,
-        mobile: DataTypes.INTEGER,
+        nickName: DataTypes.STRING,
+        mobile: DataTypes.STRING,
+        sign_body: DataTypes.STRING,
         isAdmin: {
         isAdmin: {
             type: DataTypes.BOOLEAN,
             type: DataTypes.BOOLEAN,
             defaultValue: false
             defaultValue: false

bpo-stat/app/base/service/impl/all/merchantSve.js

@@ -8,7 +8,7 @@ class MerchantService extends ServiceBase {
     }
     }
 
 
     async signPage(params) {
     async signPage(params) {
-        var currentPage = Number(params.currentPage || 0);
+        var currentPage = Number(params.currentPage || 1);
         var pageSize = Number(params.pageSize || 10);
         var pageSize = Number(params.pageSize || 10);
 
 
         var where = {};
         var where = {};
@@ -17,9 +17,9 @@ class MerchantService extends ServiceBase {
                 [this.db.Op.like]: "%" + params.company_name + "%"
                 [this.db.Op.like]: "%" + params.company_name + "%"
             };
             };
         }
         }
-        where.sign_body = {
-            [this.db.Op.eq]:  params.sign_body
-        };
+        if (params.sign_body) {
+            where.sign_body = params.sign_body
+        }
         this.addWhereTime(where, 'begin_time', params.signBegin, params.signEnd, true);
         this.addWhereTime(where, 'begin_time', params.signBegin, params.signEnd, true);
         var orderby = [
         var orderby = [
             ["id", 'desc']
             ["id", 'desc']