From 501222efa85e0f36be77b78a6141ac0f12b0e32c Mon Sep 17 00:00:00 2001
From: Odboy <tianjun@odboy.cn>
Date: Mon, 24 Mar 2025 20:22:27 +0800
Subject: [PATCH] =?UTF-8?q?upd:=20=E7=BC=96=E7=A0=81=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/odboy/model/system/domain/Dict.java   |  2 +-
 .../cn/odboy/model/system/domain/DictDetail.java  |  2 +-
 .../main/resources/mapper/DictDetailMapper.xml    | 15 ++++++---------
 .../src/main/resources/mapper/DictMapper.xml      |  2 +-
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Dict.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Dict.java
index 92cc107c..1cfcbbe3 100644
--- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Dict.java
+++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/Dict.java
@@ -19,7 +19,7 @@ public class Dict extends MyEntity {
 
     @NotNull(groups = Update.class)
     @ApiModelProperty(value = "ID", hidden = true)
-    @TableId(value = "dict_id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     @NotBlank
diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/DictDetail.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/DictDetail.java
index 1369ed71..690561c1 100644
--- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/DictDetail.java
+++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/domain/DictDetail.java
@@ -18,7 +18,7 @@ public class DictDetail extends MyEntity {
 
     @NotNull(groups = Update.class)
     @ApiModelProperty(value = "ID", hidden = true)
-    @TableId(value = "detail_id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     @TableField(value = "dict_id")
diff --git a/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml
index e38753cf..ea9cb3cc 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.odboy.modules.system.mapper.DictDetailMapper">
     <resultMap id="BaseResultMap" type="cn.odboy.model.system.domain.DictDetail">
-        <id column="detail_id" property="id" jdbcType="BIGINT"/>
+        <id column="id" property="id" jdbcType="BIGINT"/>
         <result column="label" property="label" jdbcType="VARCHAR"/>
         <result column="value" property="value" jdbcType="VARCHAR"/>
         <result column="dict_sort" property="dictSort" jdbcType="INTEGER"/>
@@ -12,24 +12,21 @@
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
         <!-- 一对一关联 -->
         <association property="dict" javaType="cn.odboy.model.system.domain.Dict">
-            <id column="dict_id" property="id" jdbcType="BIGINT"/>
+            <id column="id" property="id" jdbcType="BIGINT"/>
             <result column="name" property="name" jdbcType="VARCHAR"/>
         </association>
     </resultMap>
 
     <sql id="Base_Column_List">
-        dd
-        .
-        detail_id
-        , dd.label, dd.`value`, dd.`dict_sort`, dd.create_by, dd.update_by, dd.create_time, dd.update_time,
-        d.dict_id, d.name
+        dd.id, dd.label, dd.`value`, dd.`dict_sort`, dd.create_by, dd.update_by, dd.create_time, dd.update_time,
+        d.id as dict_id, d.name
     </sql>
 
     <select id="findAll" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
         from sys_dict_detail dd, sys_dict d
-        where dd.dict_id = d.dict_id
+        where dd.dict_id = d.id
         <if test="criteria.dictName != null and criteria.dictName != ''">
             and d.name = #{criteria.dictName}
         </if>
@@ -43,7 +40,7 @@
         select
         <include refid="Base_Column_List"/>
         from sys_dict_detail dd, sys_dict d
-        where dd.dict_id = d.dict_id
+        where dd.dict_id = d.id
         <if test="name != null and name != ''">
             and d.name = #{name}
         </if>
diff --git a/cutejava/cutejava-system/src/main/resources/mapper/DictMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/DictMapper.xml
index 9c9888ac..3dbfa9a3 100644
--- a/cutejava/cutejava-system/src/main/resources/mapper/DictMapper.xml
+++ b/cutejava/cutejava-system/src/main/resources/mapper/DictMapper.xml
@@ -13,6 +13,6 @@
                 )
             </if>
         </where>
-        order by d.dict_id desc
+        order by d.id desc
     </select>
 </mapper>
\ No newline at end of file