From 7ae2ba0ce14496fc9ad2a2dc63e623addb760ad8 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Tue, 18 Mar 2025 11:28:17 +0800
Subject: [PATCH] 1

---
 .../controller/BaseCategoryController.java     | 18 +++++++++++++-----
 .../java/com/ruoyi/base/domain/BaseConfig.java |  3 +++
 .../resources/mapper/base/BaseConfigMapper.xml |  4 +++-
 .../handler/DefaultDBFieldHandler.java         |  2 +-
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseCategoryController.java
index 61c6843..83221b1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseCategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/base/controller/BaseCategoryController.java
@@ -4,8 +4,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -44,12 +47,17 @@ public class BaseCategoryController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('base:category:list')")
     @GetMapping("/list")
-    public AjaxResult list(BaseCategory baseCategory,
-                                @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
-                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize)
+    public AjaxResult list(BaseCategory baseCategory)
     {
-        Page<BaseCategory> page = new Page<>(pageNum, pageSize);
-        IPage<BaseCategory> list = baseCategoryService.queryListPage(baseCategory,page);
+        LambdaQueryWrapper<BaseCategory> queryWrapper = new LambdaQueryWrapper<BaseCategory>();
+        if(StringUtils.isNotEmpty(baseCategory.getCode())){
+            queryWrapper.like(BaseCategory::getCode,baseCategory.getCode());
+        }
+        if(StringUtils.isNotEmpty(baseCategory.getTitle())){
+            queryWrapper.like(BaseCategory::getTitle,baseCategory.getTitle());
+        }
+        queryWrapper.orderByAsc(BaseCategory::getSort);
+        List<BaseCategory> list = baseCategoryService.list(queryWrapper);
         return success(list);
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseConfig.java
index 3eb4988..a57458c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseConfig.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/base/domain/BaseConfig.java
@@ -31,6 +31,9 @@ public class BaseConfig extends DlBaseEntity
     /** 唯一编码 */
     @Excel(name = "唯一编码")
     private String code;
+    /** 标题 */
+    @Excel(name = "标题")
+    private String title;
 
     /** json字符串 */
     @Excel(name = "json字符串")
diff --git a/ruoyi-admin/src/main/resources/mapper/base/BaseConfigMapper.xml b/ruoyi-admin/src/main/resources/mapper/base/BaseConfigMapper.xml
index b285e37..414033b 100644
--- a/ruoyi-admin/src/main/resources/mapper/base/BaseConfigMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/base/BaseConfigMapper.xml
@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="BaseConfig" id="BaseConfigResult">
         <result property="id"    column="id"    />
         <result property="code"    column="code"    />
+        <result property="title"    column="title"    />
         <result property="jsonStr"    column="json_str"    />
         <result property="creator"    column="creator"    />
         <result property="createTime"    column="create_time"    />
@@ -16,13 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBaseConfigVo">
-        select id, code, json_str, creator, create_time, updater, update_time, del_flag from dl_base_config
+        select id, code,title, json_str, creator, create_time, updater, update_time, del_flag from dl_base_config
     </sql>
 
     <select id="queryListPage" parameterType="BaseConfig" resultMap="BaseConfigResult">
         <include refid="selectBaseConfigVo"/>
         <where>
                         <if test="entity.code != null  and entity.code != ''"> and code = #{entity.code}</if>
+                        <if test="entity.title != null  and entity.title != ''"> and title = #{entity.title}</if>
                         <if test="entity.jsonStr != null  and entity.jsonStr != ''"> and json_str = #{entity.jsonStr}</if>
         </where>
     </select>
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/DefaultDBFieldHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/DefaultDBFieldHandler.java
index 70ef747..cb3b241 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/DefaultDBFieldHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/DefaultDBFieldHandler.java
@@ -61,7 +61,7 @@ public class DefaultDBFieldHandler implements MetaObjectHandler {
 //            setFieldValByName("updater", userId.toString(), metaObject);
 //        }
         //更新数据时，强制更新数据的更新时间和更新人
-        setFieldValByName("updateTime", LocalDateTime.now(), metaObject);
+        setFieldValByName("updateTime", new Date(), metaObject);
         Long userId = SecurityUtils.getUserId();
         if (Objects.nonNull(userId)) {
             setFieldValByName("updater", userId.toString(), metaObject);