core/core-backend/src/main/java/io/gisbi/application/system/controller/UserController.java

@@ -162,17 +162,18 @@ public class UserController {
     }
     @PostMapping("/login")
     @ResponseBody
-    public ResponseResult login(String appid,String username, String password) {
+    public ResponseResult login(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("app_id",appid).eq("username", username));
+        User user = userService.getOne(queryWrapper.eq("username", username));
         if (ObjUtil.isEmpty( user)) {
             return ResponseResult.error(String.format("%s您输入的用户账号不存在！", username));
         }
-        if(password.equals(user.getPassword())){
+        String encryptpass = RsaUtils.encryptStr( password);
+        if(encryptpass.equals(user.getPassword())){
             return ResponseResult.successData(user);
         }else{
             return ResponseResult.error("您输入的密码错误！");

core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetDataManage.java

@@ -1581,25 +1581,11 @@ 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;
@@ -1615,12 +1601,7 @@ private String buildPrimaryKeyQuerySQL(String dbType, String tablename) {
                 case ">=":
                     appendValue(whereClause, field, value, ">=");
                     break;
-                case "between":
+                case "!=":
-                    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;