From bac8b49c80f2068e9935865e81365411668850f1 Mon Sep 17 00:00:00 2001
From: root <13910913995@163.com>
Date: Wed, 18 Jun 2025 09:17:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=86=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/UserController.java     |  7 +++---
 .../dataset/manage/DatasetDataManage.java     | 23 +++++++++++++++++--
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/core/core-backend/src/main/java/io/gisbi/application/system/controller/UserController.java b/core/core-backend/src/main/java/io/gisbi/application/system/controller/UserController.java
index cc59eb2..0337060 100644
--- a/core/core-backend/src/main/java/io/gisbi/application/system/controller/UserController.java
+++ b/core/core-backend/src/main/java/io/gisbi/application/system/controller/UserController.java
@@ -162,18 +162,17 @@ public class UserController {
     }
     @PostMapping("/login")
     @ResponseBody
-    public ResponseResult login(String username, String password) {
+    public ResponseResult login(String appid,String username, String password) {
         if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) {
             return ResponseResult.error("用户名称或者密码不能为空！");
         }
         // 根据用户名查询用户
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
-        User user = userService.getOne(queryWrapper.eq("username", username));
+        User user = userService.getOne(queryWrapper.eq("app_id",appid).eq("username", username));
         if (ObjUtil.isEmpty( user)) {
             return ResponseResult.error(String.format("%s您输入的用户账号不存在！", username));
         }
-        String encryptpass = RsaUtils.encryptStr( password);
-        if(encryptpass.equals(user.getPassword())){
+        if(password.equals(user.getPassword())){
             return ResponseResult.successData(user);
         }else{
             return ResponseResult.error("您输入的密码错误！");
diff --git a/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetDataManage.java b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetDataManage.java
index 906aaa6..8881206 100644
--- a/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetDataManage.java
+++ b/core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetDataManage.java
@@ -1581,11 +1581,25 @@ private String buildPrimaryKeyQuerySQL(String dbType, String tablename) {
             if (i > 0) {
                 whereClause.append(" AND ");
             }
-
             switch (operator) {
                 case "like":
                     whereClause.append(String.format("%s LIKE '%%%s%%'", field, value));
                     break;
+                case "mlike":
+                     String fields[]=field.split(",");
+                     for(int j=0;j<fields.length;j++){
+                         if(j==0){
+                             whereClause.append("(");
+                         }
+                        if(j>0){
+                            whereClause.append(" OR ");
+                        }
+                        whereClause.append(String.format("%s LIKE '%%%s%%'", fields[j], value));
+                        if(j==fields.length-1){
+                            whereClause.append(")");
+                        }
+                    }
+                    break;
                 case "=":
                     appendValue(whereClause, field, value, "=");
                     break;
@@ -1601,7 +1615,12 @@ private String buildPrimaryKeyQuerySQL(String dbType, String tablename) {
                 case ">=":
                     appendValue(whereClause, field, value, ">=");
                     break;
-                case "!=":
+                case "between":
+                    String datevales[]=String.valueOf(value).split(",");
+                    appendValue(whereClause, field, datevales[0]+" 00:00:00", ">=");
+                    whereClause.append(" AND ");
+                    appendValue(whereClause, field, datevales[1]+" 23:59:59", "<=");
+                    break;
                 case "<>":
                     appendValue(whereClause, field, value, "<>");
                     break;