From 10b88a7ff17caf92f3d4e8a550c1085a70c2517a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:43:26 +0800
Subject: [PATCH] Merge dev_New_pro into dev_山西_晋和园_pro

---
 src/main/resources/mapper/collaborativeApproval/EnterpriseNewsMapper.xml |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 47 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/collaborativeApproval/EnterpriseNewsMapper.xml b/src/main/resources/mapper/collaborativeApproval/EnterpriseNewsMapper.xml
new file mode 100644
index 0000000..830a858
--- /dev/null
+++ b/src/main/resources/mapper/collaborativeApproval/EnterpriseNewsMapper.xml
@@ -0,0 +1,47 @@
+<?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.ruoyi.collaborativeApproval.mapper.EnterpriseNewsMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.ruoyi.collaborativeApproval.pojo.EnterpriseNews">
+        <id column="id" property="id" />
+        <result column="title" property="title" />
+        <result column="summary" property="summary" />
+        <result column="content" property="content" />
+        <result column="category" property="category" />
+        <result column="read_scope" property="readScope" />
+        <result column="is_required" property="isRequired" />
+        <result column="status" property="status" />
+        <result column="required_read_count" property="requiredReadCount" />
+        <result column="read_count" property="readCount" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_user" property="updateUser" />
+        <result column="update_time" property="updateTime" />
+        <result column="dept_id" property="deptId" />
+    </resultMap>
+    <select id="listPage" resultType="com.ruoyi.collaborativeApproval.vo.EnterpriseNewsVo">
+        select en.*, u.nick_name as create_user_name from
+        enterprise_news en
+        left join sys_user u on en.create_user = u.user_id
+        <where>
+            <if test="enterpriseNewsDto.title != null and enterpriseNewsDto.title != ''">
+                and en.title like concat('%',#{enterpriseNewsDto.title},'%')
+            </if>
+            <if test="enterpriseNewsDto.category != null and enterpriseNewsDto.category != ''">
+                and en.category = #{enterpriseNewsDto.category}
+            </if>
+            <if test="enterpriseNewsDto.status != null ">
+                and en.status = #{enterpriseNewsDto.status}
+            </if>
+            <if test="enterpriseNewsDto.createUser != null and enterpriseNewsDto.createUser != ''">
+                and en.create_user = #{enterpriseNewsDto.createUser}
+            </if>
+            <if test="enterpriseNewsDto.createTimeStart != null and enterpriseNewsDto.createTimeEnd != null">
+                and en.create_time between #{enterpriseNewsDto.createTimeStart} and #{enterpriseNewsDto.createTimeEnd}
+            </if>
+        </where>
+        order by en.create_time desc
+    </select>
+
+</mapper>

--
Gitblit v1.9.3