From 4722a0b64e37eae830a72a50aaef300aeb6a5f9f Mon Sep 17 00:00:00 2001
From: Cui YongXing <2835316714@qq.com>
Date: Thu, 25 Jul 2024 21:01:25 +0800
Subject: [PATCH] Dockerfile

---
 Dockerfile                                        | 15 +++++++++++++++
 .../resources/mapper/system/SysNoticeMapper.xml   | 14 +++++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..d04295c
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,15 @@
+#指定构建镜像的起始镜像
+FROM anolis-registry.cn-zhangjiakou.cr.aliyuncs.com/openanolis/dragonwell:17.0.4.0.4.8-standard-ga-8.6
+#定义时区参数
+ENV TZ=Asia/Shanghai
+#设置时区
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo '$TZ' > /etc/timezone
+
+#挂载目录
+VOLUME ["/home/logs/cloud-modules-system"]
+
+#拷贝执行jar报
+COPY ./target/cloud-modules-system.jar /home/app.jar
+
+ENTRYPOINT ["java","-jar"]
+CMD ["/home/app.jar"]
diff --git a/src/main/resources/mapper/system/SysNoticeMapper.xml b/src/main/resources/mapper/system/SysNoticeMapper.xml
index 70bd91c..34cb91c 100644
--- a/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ b/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -65,17 +65,21 @@
     </select>
     <select id="findList" resultMap="SysNoticeVoResult">
         SELECT * FROM sys_notice  n LEFT JOIN sys_inform i on n.notice_id = i.notice_id
-        WHERE user_id = #{userId}
-          <if test="noticeType==2"> and notice_type=#{noticeType} and n.start_time &lt; now() and n.end_time &gt; now() </if>
-          <if test="noticeType==1"> and notice_type=#{noticeType} </if>
-          <if test="state!=0"> and i.state=#{state}</if>
+        <where>
+            <if test="noticeType==0"> and ( ( user_id = #{userId} and notice_type=1 ) or (user_id = #{userId} and notice_type=2
+                and n.start_time &lt; now() and n.end_time &gt; now()))</if>
+
+            <if test="noticeType==2"> and  user_id = #{userId} and notice_type=#{noticeType} and n.start_time &lt; now() and n.end_time &gt; now() </if>
+            <if test="noticeType==1"> and user_id = #{userId} and notice_type=#{noticeType} </if>
+            <if test="state!=0"> and i.state=#{state}</if>
+        </where>
     </select>
     <select id="look" resultMap="SysNoticeVoResult">
         SELECT * FROM sys_notice  n LEFT JOIN sys_inform i on n.notice_id = i.notice_id
         WHERE i.id = #{id}
     </select>
     <select id="NoticeCount" resultType="java.lang.Integer">
-        SELECT count(i.notice_id) FROM sys_notice  n LEFT JOIN sys_inform i on n.notice_id = i.notice_id where i.notice_id=#{id}
+        SELECT count(i.notice_id) FROM sys_notice  n LEFT JOIN sys_inform i on n.notice_i d = i.notice_id where i.notice_id=#{id}
     </select>
     <select id="NoticePageview" resultType="java.lang.Integer">
         SELECT count(i.notice_id) FROM sys_notice  n LEFT JOIN sys_inform i on n.notice_id = i.notice_id where i.notice_id=#{id} and state=2