From c00558fce3c2565e90b9d8e6c085b635a4fc321a Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Thu, 15 Dec 2022 16:07:40 +0800
Subject: [PATCH] user

---
 .../java/org/nl/common/domain/query/BaseQuery.java   | 12 +++++-------
 .../java/org/nl/common/domain/query/PageQuery.java   | 11 +++++------
 .../main/java/org/nl/common/domain/query/QParam.java |  3 +++
 .../java/org/nl/system/service/user/dao/SysUser.java |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java
index 7ea57cc..0d22889 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java
@@ -16,10 +16,10 @@ import java.util.Map;
 @Data
 public class BaseQuery<T> {
 
-   public Map<String, QParam> doP = MapOf.of("blurry", QParam.builder().k(new String[]{"name"}).type(QueryTEnum.LK)
-   ,"startTime", QParam.builder().k(new String[]{"createTime"}).type(QueryTEnum.LT)
-   ,"endTime", QParam.builder().k(new String[]{"createTime"}).type(QueryTEnum.LE)
-   ,"sort", QParam.builder().k(new String[]{"sort"}).type(QueryTEnum.BY)
+   public Map<String, QParam> doP = MapOf.of("blurry", QParam.builder().k(new String[]{"name"}).type(QueryTEnum.LK).build()
+   ,"startTime", QParam.builder().k(new String[]{"createTime"}).type(QueryTEnum.LT).build()
+   ,"endTime", QParam.builder().k(new String[]{"createTime"}).type(QueryTEnum.LE).build()
+   ,"sort", QParam.builder().k(new String[]{"sort"}).type(QueryTEnum.BY).build()
    );
 
     private String blurry;
@@ -30,14 +30,12 @@ public class BaseQuery<T> {
 
     private Date endTime;
 
-    private String sort;
-
     public QueryWrapper<T> build(){
         this.paramMapping();
         QueryWrapper<T> wrapper = new QueryWrapper<>();
         JSONObject json = (JSONObject)JSONObject.toJSON(this);
         json.forEach((key, vel) -> {
-            if (vel != null){
+            if (vel != null && !key.equals("doP")){
                 QParam qParam = doP.get(key);
                 if (qParam != null){
                     QueryTEnum.build(qParam.type,wrapper,qParam.k,vel);
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/PageQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/PageQuery.java
index ecfacee..30dc646 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/PageQuery.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/PageQuery.java
@@ -7,6 +7,7 @@ import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
+import java.util.Locale;
 
 
 /**
@@ -56,12 +57,10 @@ public class PageQuery implements Serializable {
         Page<T> page = new Page<>(pageNum, pageSize);
         if (StringUtils.isNotEmpty(sort)){
             String[] split = sort.split(",");
-            for (String col : split) {
-                OrderItem item = new OrderItem();
-                item.setColumn(col);
-                item.setAsc(isAsc);
-                page.addOrder(item);
-            }
+            String col = split[0];
+            OrderItem item = new OrderItem();
+            item.setColumn(split[0]);
+            item.setAsc(split[1].toLowerCase(Locale.ROOT).equals("asc"));
         }
         return page;
     }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/QParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/QParam.java
index 9d73775..dee5c8d 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/QParam.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/QParam.java
@@ -1,6 +1,9 @@
 package org.nl.common.domain.query;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.nl.common.enums.QueryTEnum;
 
 /*
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java
index 09508bc..05cf241 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java
@@ -27,7 +27,7 @@ public class SysUser implements Serializable {
     /**
      * 用户标识
      */
-    @TableId(value = "user_id", type = IdType.AUTO)
+    @TableId(value = "user_id", type = IdType.INPUT)
     private Long userId;
 
     /**