gsb

bpo-web/app/base/db/impl/econtractDao.js

@@ -87,7 +87,7 @@ class EcontractDao extends Dao {
       sql.push("AND t1.`etemplate_id` = :ecid");
       sql.push("AND t1.`etemplate_id` = :ecid");
     }
     }
     if (params.today) {
     if (params.today) {
-      sql.push("AND t1.`end_at` >= :today AND t1.`begin_at` <= :today");
+      sql.push("AND t1.`end_at` >= :today");
     }
     }
 
 
     let list = await this.customQuery(sql.join(" "), params);
     let list = await this.customQuery(sql.join(" "), params);

bpo-web/app/base/service/impl/econtractSve.js

@@ -1368,8 +1368,8 @@ class EcontractService extends ServiceBase {
         //     usereaccount_id: eaccount.id,
         //     usereaccount_id: eaccount.id,
         //     etemplate_id: ecid,
         //     etemplate_id: ecid,
         // });
         // });
-        let todays = new Date().Format("YYYY-MM-DD HH:mm:ss");
-        let contractId = await this.dao.findSignedContractId({idno: eaccount.personsSign, ecid: ecid,today : todays}) || 0;
+        let todays = moment().format("YYYY-MM-DD") + " 00:00:00";
+        let contractId = await this.dao.findSignedContractId({idno: eaccount.personsSign, ecid: ecid, today : todays}) || 0;
         if (contractId) {
         if (contractId) {
             return this.returnjson(0, "用户已经签约", {
             return this.returnjson(0, "用户已经签约", {
                 contractId: contractId
                 contractId: contractId