doomiwork 3.7.5 → 3.7.7

package/core/controller.js

@@ -151,7 +151,7 @@ class controller {
         if (!id) id = req.params.id;
         if (!id) return {successed:false,errcode:-2,errmsg:'缺失批量操作的id'}
         let batchSql = rcp.parseAndReplaceSql(req,this._daoModel.BatchSql());
-        let result = await this._daoModel.batchUpdate(batchSql,model,id)
+        let result = await this._daoModel.batchUpdate(batchSql, model, id, req.user?.id)
         this.logUserAction(req,this._daoModel.getBusiness(),6,result.successed?0:-1);
         return result;
     }

package/core/database/daoBase.js

@@ -105,10 +105,10 @@ class mysqlDao extends dao{
         ////如果是逻辑删除，则只将记录的删除状态设置为1
         if(this.tableoption.logicDelete)  {
 
-            return `update ${this.tableoption.tableName} set ${this.tableoption.logicDeleteField || 'rec_isdeleted'} =1 where ${this.tableoption.primaryKey}=? ${this.tableoption.forcefilter}`; 
-            //sqlDelete = sqlDelete.replace('#DELETEBY#', this.tableoption.logDeleteBy?`${this.tableoption.logDeleteBy}=?,`:'')
-            //sqlDelete = sqlDelete.replace('#DELETEDATE#', this.tableoption.logDeleteDate ? `${this.tableoption.logDeleteDate}=now(),` : '');
-            //return sqlDelete;
+            let sqlDelete = `update ${this.tableoption.tableName} set #DELETEBY# #DELETEDATE# ${this.tableoption.logicDeleteField || 'rec_isdeleted'} =1 where ${this.tableoption.primaryKey}=? ${this.tableoption.forcefilter}`; 
+            sqlDelete = sqlDelete.replace('#DELETEBY#', this.tableoption.logDeleteBy?`${this.tableoption.logDeleteBy}=?,`:'')
+            sqlDelete = sqlDelete.replace('#DELETEDATE#', this.tableoption.logDeleteDate ? `${this.tableoption.logDeleteDate}=now(),` : '');
+            return sqlDelete;
         }
         return `delete from ${this.tableoption.tableName} where ${this.tableoption.primaryKey}=? ${this.tableoption.forcefilter}`; 
     }
@@ -128,7 +128,12 @@ class mysqlDao extends dao{
     async update(Sql, model, id) {return this.executeSql(Sql, [model, id]);}
     ///删除记录
     async delete(Sql, id,userid) { 
+        if (this.tableoption.logicDelete && this.tableoption.logDeleteBy){
+            return this.executeSql(Sql, [userid,id]); 
+        }
         return this.executeSql(Sql, id); 
+        ///
+        //return this.executeSql(Sql, id); 
         /*if (result.successed && this.tableoption.logicDelete && userid && (this.tableoption.logDeleteBy || this.tableoption.logDeleteDate)){
             let sqlLog = `update ${this.tableoption.tableName} set ? where ${this.tableoption.primaryKey}=? ${this.tableoption.forcefilter}`; 
             let model = {};
@@ -327,7 +332,14 @@ class mysqlDao extends dao{
      * @param {*} model 需要改变的属性键值对
      * @param {*} id 批量操作的id集合，逗号分开
      */
-    async batchUpdate(Sql,model,id){
+    async batchUpdate(Sql,model,id,userid){
+        ////记录批量删除的人
+        if (this.tableoption.logicDelete && this.tableoption.logDeleteBy && model[this.tableoption.logicDeleteField || 'rec_isdeleted']!=null ) {
+            model[this.tableoption.logDeleteBy] = userid;
+            if (this.tableoption.logDeleteDate){
+                model[this.tableoption.logDeleteDate] = Moment().format('YYYY-MM-DD HH:mm:ss');
+            }
+        }
         return this.executeSql(Sql, [model, id])
             .then(result=>{
                 return {successed:true,count:result.rows.affectedRows }

package/core/database/mysqlbase.js

@@ -45,7 +45,7 @@ class Database {
     async existedSqlData(sqlCommand, parameters, conn, autoclose = true) {
         let sqlExecute = await this.executeSql(sqlCommand, parameters, conn, autoclose);
         if (!sqlExecute.successed) return { successed: false }
-        if (!sqlExecute.rows || sqlExecute.rows.length == 0) return { success: true, existed: false }
+        if (!sqlExecute.rows || sqlExecute.rows.length == 0) return { successed: true, existed: false }
         return { successed: true, existed: true, ...sqlExecute.rows[0] }
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doomiwork",
-  "version": "3.7.5",
+  "version": "3.7.7",
   "description": "doomisoft nodejs web framework",
   "main": "index.js",
   "scripts": {