From 89cb05f837c76b001208770cb62c7ad840449c0a Mon Sep 17 00:00:00 2001
From: wangrong <wangrong@shsening.com>
Date: 星期四, 08 十二月 2022 15:31:41 +0800
Subject: [PATCH] 修改编译发布方式
---
server/utils/handle_db.js | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/server/utils/handle_db.js b/server/utils/handle_db.js
old mode 100644
new mode 100755
index 5128696..6378723
--- a/server/utils/handle_db.js
+++ b/server/utils/handle_db.js
@@ -143,19 +143,15 @@
let create_sql = function(obj,pagesize_,pageindex_) {
let str_select_ = [];
let str_select_count = [];
- str_select_.push(obj.select_ + ' ' + obj.from_ + ' ' + obj.where_ + ' ' + obj.order_);
- str_select_count.push('select count(1) as counter '+obj.from_ +' ' + obj.where_ + ' ' + obj.order_);
- try {
- if (pagesize_ && Number(pagesize_)>=0) {
- let pageindex = (Number(pageindex_)>=0) ? Number(pageindex_) : 1;
- let pagesize = (Number(pagesize_)>=0) ? Number(pagesize_) : 10;
- str_select_.push(' limit ')
- str_select_.push((pageindex-1)*pagesize)
- str_select_.push(', ')
- str_select_.push(pagesize);
- }
- } catch (error) {
-
+ str_select_.push(obj.select_ + obj.from_ + obj.where_ + obj.order_);
+ str_select_count.push('select count(1) as counter from ('+obj.select_+obj.from_ + obj.where_ + obj.order_+') count_');
+ if (obj.server_paging == '1') {
+ let pageindex = (Number(pageindex_)>=0) ? Number(pageindex_) : 1;
+ let pagesize = (Number(pagesize_)>=0) ? Number(pagesize_) : 10;
+ str_select_.push(' limit ')
+ str_select_.push((pageindex-1)*pagesize)
+ str_select_.push(', ')
+ str_select_.push(pagesize);
}
return [str_select_count.join(''),str_select_.join('')]
}
@@ -167,8 +163,8 @@
let create_sync_sql = function(obj) {
let str_select_ = [];
let str_sync = [];
- str_select_.push(obj.select_ + ' ' + obj.from_ + ' ' + obj.where_ + ' ' + obj.order_);
- str_sync.push(obj.insert_ + ' ' + obj.column_ + ' ' + obj.values_ + ' ' + obj.updateDuplicate_);
+ str_select_.push(obj.select_ + obj.from_ + obj.where_ + obj.order_);
+ str_sync.push(obj.insert_ + obj.column_ + obj.values_ + obj.updateDuplicate_);
return [str_select_.join(''),str_sync.join('')]
}
--
Gitblit v1.9.1