Dockerfile

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"]

src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -65,10 +65,14 @@
     </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}
+        <where>
-          <if test="noticeType==2"> and notice_type=#{noticeType} and n.start_time &lt; now() and n.end_time &gt; now() </if>
+            <if test="noticeType==0"> and ( ( user_id = #{userId} and notice_type=1 ) or (user_id = #{userId} and notice_type=2
-          <if test="noticeType==1"> and notice_type=#{noticeType} </if>
+                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