From f308a19516f0f15c0aca1af87c1aa722af0fee5c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 12 四月 2024 17:48:52 +0800
Subject: [PATCH] 2024-04-12

---
 src/utils/utils.js |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 8e92379..c46bc39 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -554,8 +554,8 @@
       } else if (item.type === 'range') {
         let val = item.value.split(',')
 
-        newsearches[item.key] = val[0] || -999999
-        newsearches[item.key + '1'] = val[1] || 999999
+        newsearches[item.key] = val[0] || -999999999
+        newsearches[item.key + '1'] = val[1] || 999999999
       } else if (item.type === 'dateweek') {
         let _startval = ''
         let _endval = ''
@@ -703,7 +703,7 @@
       } else if (item.type === 'range') {
         let val = item.value.split(',')
 
-        searchText.push('(' + item.key + ' >= ' + (val[0] || -999999) + ' AND ' + item.key + ' < ' + (val[1] || 999999) + ')')
+        searchText.push('(' + item.key + ' >= ' + (val[0] || -999999999) + ' AND ' + item.key + ' <= ' + (val[1] || 999999999) + ')')
       } else {
         searchText.push('(' + item.key + ' ' + item.match + ' \'' + item.value + '\')')
       }
@@ -779,9 +779,9 @@
 
         let copy = JSON.parse(JSON.stringify(item))
         copy.key = copy.key + '1'
-        copy.value = val[1] || 999999
+        copy.value = val[1] || 999999999
         
-        item.value = val[0] || -999999
+        item.value = val[0] || -999999999
 
         options.push(item)
         options.push(copy)
@@ -2326,6 +2326,9 @@
         _sql = _sql.replace(/@check_userids@/ig, `''`)
         _sql = _sql.replace(/@notice_userids@/ig, `''`)
       }
+    } else {
+      _sql = _sql.replace(/@check_userids@/ig, `''`)
+      _sql = _sql.replace(/@notice_userids@/ig, `''`)
     }
 
     _sql = _sql.replace(/@start_type@/ig, `'寮�濮�'`)

--
Gitblit v1.8.0