gsb

laowubao/app/base/db/impl/common/workloadDao.js

@@ -42,11 +42,14 @@ class WorkloadDao extends Dao {
     sql.push("`created_at`, `updated_time`, `workload`, ");
     sql.push("`created_at`, `updated_time`, `workload`, ");
     sql.push("`created_time`, `updated_at`, `status`");
     sql.push("`created_time`, `updated_at`, `status`");
     sql.push("FROM `workload_info`");
     sql.push("FROM `workload_info`");
-    sql.push("WHERE id_nu = :id_nu");
+    sql.push("WHERE id_nu = :id_nu AND user_id = :user_id");
     return await this.customQuery(sql.join(" "), params);
     return await this.customQuery(sql.join(" "), params);
   }
   }
 
 
   setCondition(sql, params) {
   setCondition(sql, params) {
+    if (params.user_id) {
+      sql.push("AND user_id = :user_id");
+    }
     if (params.username) {
     if (params.username) {
       sql.push("AND username = :username");
       sql.push("AND username = :username");
     }
     }

laowubao/app/base/db/models/common/workload.js

@@ -3,6 +3,7 @@ const settings=require("../../../../config/settings");
 const uiconfig=system.getUiConfig2(settings.appKey);
 const uiconfig=system.getUiConfig2(settings.appKey);
 module.exports = (db, DataTypes) => {
 module.exports = (db, DataTypes) => {
     return db.define("workload", {
     return db.define("workload", {
+        user_id: DataTypes.INTEGER,
         username: DataTypes.STRING,
         username: DataTypes.STRING,
         iphone: DataTypes.STRING,
         iphone: DataTypes.STRING,
         id_nu: DataTypes.STRING,
         id_nu: DataTypes.STRING,

laowubao/app/base/service/impl/common/workloadSve.js

@@ -13,12 +13,12 @@ class WorkloadService extends ServiceBase {
     var currentPage = Number(params.currentPage || 1);
     var currentPage = Number(params.currentPage || 1);
     var pageSize = Number(params.pageSize || 10);
     var pageSize = Number(params.pageSize || 10);
 
 
+    var user_id = Number(params.userId);
     var username = this.trim(params.username);
     var username = this.trim(params.username);
     var iphone = this.trim(params.iphone);
     var iphone = this.trim(params.iphone);
     var id_nu = this.trim(params.id_nu);
     var id_nu = this.trim(params.id_nu);
-    var status = this.trim(params.status);
 
 
-    var where = {};
+    var where = {user_id: user_id};
 
 
     var orderby = [
     var orderby = [
       ["id", 'desc']
       ["id", 'desc']
@@ -52,7 +52,7 @@ class WorkloadService extends ServiceBase {
     sql.push("UPDATE");
     sql.push("UPDATE");
     sql.push("workload_info");
     sql.push("workload_info");
     sql.push("SET `status` = 1, updated_at = :updated_at");
     sql.push("SET `status` = 1, updated_at = :updated_at");
-    sql.push("WHERE `status` = 0");
+    sql.push("WHERE `status` = 0 AND user_id = :userId");
 
 
     if (params.id) {
     if (params.id) {
       sql.push("AND id = :id ");
       sql.push("AND id = :id ");
@@ -65,7 +65,7 @@ class WorkloadService extends ServiceBase {
     params.currentPage = Number(params.currentPage || 1);
     params.currentPage = Number(params.currentPage || 1);
     params.pageSize = Number(params.pageSize || 10);
     params.pageSize = Number(params.pageSize || 10);
 
 
-
+    params.user_id = Number(params.userId);
     params.username = this.trim(params.username);
     params.username = this.trim(params.username);
     params.iphone = this.trim(params.iphone);
     params.iphone = this.trim(params.iphone);
     params.id_nu = this.trim(params.id_nu);
     params.id_nu = this.trim(params.id_nu);
@@ -87,11 +87,12 @@ class WorkloadService extends ServiceBase {
   }
   }
 
 
   async historyInfo(params) {
   async historyInfo(params) {
+    params.user_id = Number(params.userId);
     let wl = await this.findById(params.id);
     let wl = await this.findById(params.id);
     if (!wl) {
     if (!wl) {
       return [];
       return [];
     }
     }
-    let list = await this.dao.findByIdNo({id_nu: wl.id_nu});
+    let list = await this.dao.findByIdNo({id_nu: wl.id_nu, user_id: params.user_id});
     if (list) {
     if (list) {
       for (var item of list) {
       for (var item of list) {
         this.handleDate(item, ['created_time', 'updated_time'], 'YYYY-MM-DD');
         this.handleDate(item, ['created_time', 'updated_time'], 'YYYY-MM-DD');
@@ -131,6 +132,7 @@ class WorkloadService extends ServiceBase {
         }
         }
 
 
         var data = {};
         var data = {};
+        data.user_id = userId;
         data.username = this.trim(cells[1]);
         data.username = this.trim(cells[1]);
         data.iphone = this.trim(cells[2]);
         data.iphone = this.trim(cells[2]);
         data.id_nu = this.trim(cells[3]);
         data.id_nu = this.trim(cells[3]);