From 17898f5677083a5970314d2410ddf2cbe1eb7a60 Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Mon, 19 Aug 2024 17:49:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=AD=97=E5=85=B8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9,=E6=B8=97?=
 =?UTF-8?q?=E5=8E=8B=E8=AE=BE=E5=A4=87=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?,=E9=97=B8=E9=98=80=E5=85=B3=E8=81=94=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E7=82=B9=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gunshi/project/xyt/controller/SysDictBController.java   | 5 ++++-
 .../gunshi/project/xyt/mapper/GateValveCctvRelMapper.java   | 4 ++--
 .../com/gunshi/project/xyt/model/OsmoticPressDevice.java    | 2 +-
 src/main/java/com/gunshi/project/xyt/model/SysDictB.java    | 6 ++----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/controller/SysDictBController.java b/src/main/java/com/gunshi/project/xyt/controller/SysDictBController.java
index 99d9c8b..5055758 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/SysDictBController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/SysDictBController.java
@@ -54,6 +54,9 @@ public class SysDictBController {
                 throw new IllegalArgumentException("当父级不存在");
             }
         }
+        if (null == dto.getPid()){
+            dto.setPid(0L);
+        }
         dto.setCreateTm(new Date());
         dto.setId(IdWorker.getId());
 
@@ -108,7 +111,7 @@ public class SysDictBController {
 
         LambdaQueryWrapper<SysDictB> queryWrapper = Wrappers.lambdaQuery();
 
-        Page<SysDictB> data = service.page(page.getPageSo().toPage(), queryWrapper.isNull(SysDictB::getPid));
+        Page<SysDictB> data = service.page(page.getPageSo().toPage(), queryWrapper.eq(SysDictB::getPid,0L));
         return R.ok(data);
     }
 
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/GateValveCctvRelMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/GateValveCctvRelMapper.java
index 7ce485c..011fc95 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/GateValveCctvRelMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/GateValveCctvRelMapper.java
@@ -33,8 +33,8 @@ public interface GateValveCctvRelMapper extends BaseMapper<GateValveCctvRel> {
                      acb.name LIKE concat('%',#{obj.indexName},'%') 
                 </if> 
                 </where>
-                <if test="obj.sortField != null and obj.sortField !=''">
-                    order by t.${obj.sortField} asc
+                <if test="obj.orderField != null and obj.orderField !=''">
+                    order by t.${obj.orderField} asc
                 </if> 
             </script>
             """)
diff --git a/src/main/java/com/gunshi/project/xyt/model/OsmoticPressDevice.java b/src/main/java/com/gunshi/project/xyt/model/OsmoticPressDevice.java
index 242c747..a763bfa 100644
--- a/src/main/java/com/gunshi/project/xyt/model/OsmoticPressDevice.java
+++ b/src/main/java/com/gunshi/project/xyt/model/OsmoticPressDevice.java
@@ -148,7 +148,7 @@ public class OsmoticPressDevice implements Serializable {
         /**
         * 温度的基准值T₀
         */
-        @TableField(value="t")
+        @TableField(value="t0")
         @Schema(description="温度的基准值T₀")
         private BigDecimal t0;
 
diff --git a/src/main/java/com/gunshi/project/xyt/model/SysDictB.java b/src/main/java/com/gunshi/project/xyt/model/SysDictB.java
index 304b638..38527c6 100644
--- a/src/main/java/com/gunshi/project/xyt/model/SysDictB.java
+++ b/src/main/java/com/gunshi/project/xyt/model/SysDictB.java
@@ -40,7 +40,7 @@ public class SysDictB implements Serializable {
         @TableId(value="id", type= IdType.AUTO)
         @Schema(description="ID")
         // @Size(max = 0,message = "ID最大长度要小于 0")
-        @NotBlank(message = "ID不能为空",groups = {Insert.class, Update.class})
+        @NotNull(message = "ID不能为空",groups = { Update.class})
         @JsonSerialize(using = ToStringSerializer.class)
         private Long id;
 
@@ -68,7 +68,6 @@ public class SysDictB implements Serializable {
         @TableField(value="pid")
         @Schema(description="父id")
         // @Size(max = 0,message = "父id最大长度要小于 0")
-        @NotBlank(message = "父id不能为空",groups = {Insert.class, Update.class})
         private Long pid;
 
         /**
@@ -77,7 +76,7 @@ public class SysDictB implements Serializable {
         @TableField(value="sort_on")
         @Schema(description="排序字段")
         // @Size(max = 0,message = "排序字段最大长度要小于 0")
-        @NotBlank(message = "排序字段不能为空",groups = {Insert.class, Update.class})
+//        @NotNull(message = "排序字段不能为空",groups = {Insert.class, Update.class})
         private Integer sortOn;
 
         /**
@@ -106,7 +105,6 @@ public class SysDictB implements Serializable {
         @TableField(value="status")
         @Schema(description="状态 1：启用 0：禁用")
         // @Size(max = 0,message = "状态 1：启用 0：禁用最大长度要小于 0")
-        @NotNull(message = "状态 1：启用 0：禁用不能为空",groups = {Insert.class, Update.class})
         private Integer status;