From 6ceda40d18a749e09c1c676a1c9d22fe40fe7c13 Mon Sep 17 00:00:00 2001
From: wangna0328 <3402195679@qq.com>
Date: Mon, 4 Aug 2025 19:32:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E5=A6=82=E5=88=9D=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=86=E5=8F=91=E7=8E=B0=E5=85=B6=E4=BB=96bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../znpt/domain/entity/RegulationEntity.java  |  6 +++-
 .../domain/entity/RegulationTypeEntity.java   | 10 +++---
 .../znpt/service/RegulationTypeService.java   |  2 +-
 .../service/impl/RegulationServiceImpl.java   |  5 +++
 .../impl/RegulationTypeServiceImpl.java       |  2 +-
 .../resources/mapper/RegulationMapper.xml     | 32 +++++++++++++++++++
 .../resources/mapper/RegulationTypeMapper.xml | 10 +++---
 7 files changed, 54 insertions(+), 13 deletions(-)
 create mode 100644 core/src/main/resources/mapper/RegulationMapper.xml

diff --git a/core/src/main/java/com/dite/znpt/domain/entity/RegulationEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/RegulationEntity.java
index 25f144f..6dd36f1 100644
--- a/core/src/main/java/com/dite/znpt/domain/entity/RegulationEntity.java
+++ b/core/src/main/java/com/dite/znpt/domain/entity/RegulationEntity.java
@@ -42,7 +42,7 @@ public class RegulationEntity extends AuditableEntity implements Serializable {
     @ExcelProperty("制度类型")
     @ApiModelProperty("制度类型")
     @TableField("regulation_type")
-    private String regulationType;
+    private String type;
 
     @ExcelProperty("制度状态")
     @ApiModelProperty("制度状态：DRAFT-草案，APPROVED-已公示，PUBLISHED-已发布，ARCHIVED-已归档")
@@ -96,4 +96,8 @@ public class RegulationEntity extends AuditableEntity implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty("创建人姓名")
     private String createByName;
+
+    @TableField(exist = false)
+    @ApiModelProperty("制度类型")
+    private String regulationType;
 } 
\ No newline at end of file
diff --git a/core/src/main/java/com/dite/znpt/domain/entity/RegulationTypeEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/RegulationTypeEntity.java
index 1057ff8..eb8154c 100644
--- a/core/src/main/java/com/dite/znpt/domain/entity/RegulationTypeEntity.java
+++ b/core/src/main/java/com/dite/znpt/domain/entity/RegulationTypeEntity.java
@@ -33,10 +33,10 @@ public class RegulationTypeEntity extends AuditableEntity implements Serializabl
     @TableField("type_name")
     private String typeName;
 
-    @ExcelProperty("状态")
-    @ApiModelProperty("状态：ENABLED-启用，DISABLED-禁用")
-    @TableField("status")
-    private String status;
+    @ExcelProperty("是否启用")
+    @ApiModelProperty("是否启用（1-启用，0-禁用）")
+    @TableField("is_enabled")
+    private String isEnabled;
 
     @ExcelProperty("排序顺序")
     @ApiModelProperty("排序顺序")
@@ -55,5 +55,5 @@ public class RegulationTypeEntity extends AuditableEntity implements Serializabl
 
     @TableField(exist = false)
     @ApiModelProperty("创建人姓名")
-    private String createByName;
+    private String createrName;
 } 
\ No newline at end of file
diff --git a/core/src/main/java/com/dite/znpt/service/RegulationTypeService.java b/core/src/main/java/com/dite/znpt/service/RegulationTypeService.java
index c5b8715..e221f60 100644
--- a/core/src/main/java/com/dite/znpt/service/RegulationTypeService.java
+++ b/core/src/main/java/com/dite/znpt/service/RegulationTypeService.java
@@ -16,7 +16,7 @@ public interface RegulationTypeService extends IService<RegulationTypeEntity> {
      * @param page 页码
      * @param size 页大小
      * @param typeName 类型名称
-     * @param status 状态
+     * @param status 是否启用（1-启用，0-禁用）
      * @param remark 备注
      * @return 结果
      */
diff --git a/core/src/main/java/com/dite/znpt/service/impl/RegulationServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/RegulationServiceImpl.java
index cf52e5f..f0cb608 100644
--- a/core/src/main/java/com/dite/znpt/service/impl/RegulationServiceImpl.java
+++ b/core/src/main/java/com/dite/znpt/service/impl/RegulationServiceImpl.java
@@ -203,6 +203,11 @@ public class RegulationServiceImpl extends ServiceImpl<RegulationMapper, Regulat
                 }
             }
             
+            // 设置制度类型名称
+            if (regulation.getType() != null && !regulation.getType().isEmpty()) {
+                regulation.setRegulationType(regulation.getType());
+            }
+            
             return Result.ok(regulation);
         } catch (Exception e) {
             return Result.error("获取制度详情失败：" + e.getMessage());
diff --git a/core/src/main/java/com/dite/znpt/service/impl/RegulationTypeServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/RegulationTypeServiceImpl.java
index 1a3616e..aa66d13 100644
--- a/core/src/main/java/com/dite/znpt/service/impl/RegulationTypeServiceImpl.java
+++ b/core/src/main/java/com/dite/znpt/service/impl/RegulationTypeServiceImpl.java
@@ -109,7 +109,7 @@ public class RegulationTypeServiceImpl extends ServiceImpl<RegulationTypeMapper,
             // 检查制度表中是否有使用此类型的记录（包括所有状态）
             long regulationCount = regulationMapper.selectCount(
                 new LambdaQueryWrapper<RegulationEntity>()
-                    .eq(RegulationEntity::getRegulationType, typeName)
+                    .eq(RegulationEntity::getType, typeName)
                     .eq(RegulationEntity::getDelFlag, "0")
             );
             // 如果有制度使用此类型，则不允许删除
diff --git a/core/src/main/resources/mapper/RegulationMapper.xml b/core/src/main/resources/mapper/RegulationMapper.xml
new file mode 100644
index 0000000..d3b6177
--- /dev/null
+++ b/core/src/main/resources/mapper/RegulationMapper.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dite.znpt.mapper.RegulationMapper">
+    
+    <!-- 分页查询制度列表（包含创建人姓名和制度类型名称） -->
+    <select id="selectRegulationListWithCreator" resultType="com.dite.znpt.domain.entity.RegulationEntity">
+        SELECT 
+            r.*,
+            u.name as createByName,
+            rt.type_name as regulationType
+        FROM regulation r
+        LEFT JOIN user u ON r.create_by COLLATE utf8mb4_general_ci = u.user_id COLLATE utf8mb4_general_ci
+        LEFT JOIN regulation_type rt ON r.regulation_type = rt.type_name
+        <where>
+            r.del_flag = '0'
+            <if test="status != null and status != ''">
+                AND r.status = #{status}
+            </if>
+            <if test="type != null and type != ''">
+                AND r.regulation_type = #{type}
+            </if>
+            <if test="title != null and title != ''">
+                AND r.title LIKE CONCAT('%', #{title}, '%')
+            </if>
+            <if test="proposer != null and proposer != ''">
+                AND u.name LIKE CONCAT('%', #{proposer}, '%')
+            </if>
+        </where>
+        ORDER BY r.create_time DESC
+    </select>
+    
+</mapper> 
\ No newline at end of file
diff --git a/core/src/main/resources/mapper/RegulationTypeMapper.xml b/core/src/main/resources/mapper/RegulationTypeMapper.xml
index 7ce5f6b..53211ec 100644
--- a/core/src/main/resources/mapper/RegulationTypeMapper.xml
+++ b/core/src/main/resources/mapper/RegulationTypeMapper.xml
@@ -3,24 +3,24 @@
 <mapper namespace="com.dite.znpt.mapper.RegulationTypeMapper">
 
     <sql id="Base_Column_List">
-        rt.type_id, rt.type_name, rt.status, rt.sort_order, rt.remark, rt.del_flag,
+        rt.type_id, rt.type_name, rt.is_enabled, rt.sort_order, rt.remark, rt.del_flag,
         rt.create_by, rt.create_time, rt.update_by, rt.update_time
     </sql>
 
     <select id="selectRegulationTypeListWithCreator" resultType="com.dite.znpt.domain.entity.RegulationTypeEntity">
         SELECT 
-            rt.type_id, rt.type_name, rt.status, rt.sort_order, rt.remark, rt.del_flag,
+            rt.type_id, rt.type_name, rt.is_enabled, rt.sort_order, rt.remark, rt.del_flag,
             rt.create_by, rt.create_time, rt.update_by, rt.update_time,
-            u.name as createByName
+            u.name as createrName
         FROM regulation_type rt
-        LEFT JOIN user u ON rt.create_by = u.user_id
+        LEFT JOIN user u ON rt.create_by COLLATE utf8mb4_general_ci = u.user_id COLLATE utf8mb4_general_ci
         <where>
             rt.del_flag = '0'
             <if test="typeName != null and typeName != ''">
                 AND rt.type_name LIKE concat('%', #{typeName}, '%')
             </if>
             <if test="status != null and status != ''">
-                AND rt.status = #{status}
+                AND rt.is_enabled = #{status}
             </if>
             <if test="remark != null and remark != ''">
                 AND rt.remark LIKE concat('%', #{remark}, '%')