From 7ba218b08e9d70fb9173db5b4782f6f726df1fd2 Mon Sep 17 00:00:00 2001
From: wangrong <wangrong@shsening.com>
Date: 星期五, 24 十二月 2021 15:42:05 +0800
Subject: [PATCH] fix weather bug

---
 server/utils/handle_db.js |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/server/utils/handle_db.js b/server/utils/handle_db.js
index d57a776..5128696 100644
--- a/server/utils/handle_db.js
+++ b/server/utils/handle_db.js
@@ -143,15 +143,19 @@
  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_);
-  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);
+  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) {
+    
   }
   return [str_select_count.join(''),str_select_.join('')]
 }
@@ -163,8 +167,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