xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-11-10 12:43:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复几个显示问题

Browse Source
This commit is contained in:
zhuoda
2023-02-16 20:11:43 +08:00
parent f6651b8efe
commit 521c89119f
19 changed files with 242 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
smart-admin-api/sa-admin/src/main/resources/mapper/business/notice/NoticeMapper.xml
View File

@@ -29,33 +29,33 @@
WHERE notice_id = #{noticeId}
</update>
<select id="queryPage" resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVO">
SELECT tn.*,
e.actual_name AS createUserName
FROM t_notice tn
LEFT JOIN t_employee e ON tn.create_user_id = e.employee_id
SELECT t_notice.*,
t_employee.actual_name AS createUserName
FROM t_notice
LEFT JOIN t_employee ON t_notice.create_user_id = t_employee.employee_id
<where>
tn.deleted_flag = #{queryForm.deletedFlag}
t_notice.deleted_flag = #{queryForm.deletedFlag}
<if test="queryForm.keywords != null and queryForm.keywords != ''">
AND (INSTR(tn.notice_title,#{queryForm.keywords}) OR INSTR(e.actual_name,#{queryForm.keywords}))
AND (INSTR(t_notice.notice_title,#{queryForm.keywords}) OR INSTR(t_employee.actual_name,#{queryForm.keywords}))
</if>
<if test="queryForm.noticeType != null">
AND tn.notice_type = #{queryForm.noticeType}
AND t_notice.notice_type = #{queryForm.noticeType}
</if>
<if test="queryForm.noticeBelongType != null">
AND tn.notice_belong_type = #{queryForm.noticeBelongType}
AND t_notice.notice_belong_type = #{queryForm.noticeBelongType}
</if>
<if test="queryForm.startTime != null">
AND DATE_FORMAT(tn.publish_time, '%Y-%m-%d') &gt;= #{queryForm.startTime}
AND DATE_FORMAT(t_notice.publish_time, '%Y-%m-%d') &gt;= #{queryForm.startTime}
</if>
<if test="queryForm.endTime != null">
AND DATE_FORMAT(tn.publish_time, '%Y-%m-%d') &lt;= #{queryForm.endTime}
AND DATE_FORMAT(t_notice.publish_time, '%Y-%m-%d') &lt;= #{queryForm.endTime}
</if>
<if test="queryForm.disabledFlag != null">
AND tn.disabled_flag = #{queryForm.disabledFlag}
AND t_notice.disabled_flag = #{queryForm.disabledFlag}
</if>
</where>
<if test="queryForm.sortItemList == null or queryForm.sortItemList.size == 0">
ORDER BY tn.top_flag DESC,tn.publish_time DESC
ORDER BY t_notice.top_flag DESC,t_notice.publish_time DESC
</if>
</select>
<select id="getDetail" resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVO">

2
smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/common/security/AbstractSecurityConfig.java
View File

@@ -84,6 +84,8 @@ public abstract class AbstractSecurityConfig extends WebSecurityConfigurerAdapte
// token filter 进行校验
httpSecurity.addFilterBefore(new SecurityTokenFilter(this.userFunction()), UsernamePasswordAuthenticationFilter.class);
httpSecurity.addFilterBefore(corsFilter, SecurityTokenFilter.class);
// 禁用spring security 使用 X-Frame-Options防止网页被Frame
httpSecurity.headers().frameOptions().disable();
}

7
smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/MvcConfig.java
View File

@@ -3,7 +3,6 @@ package net.lab1024.sa.common.config;
import net.lab1024.sa.common.common.interceptor.AbstractInterceptor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
@@ -28,9 +27,6 @@ public class MvcConfig implements WebMvcConfigurer {
@Autowired(required = false)
private List<HandlerInterceptor> interceptorList;
@Value("${file.storage.local.path}")
private String uploadPath;
@Override
public void addInterceptors (InterceptorRegistry registry) {
if (CollectionUtils.isEmpty(interceptorList)) {
@@ -43,8 +39,7 @@ public class MvcConfig implements WebMvcConfigurer {
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("/preview/**")
.addResourceLocations("classpath:/META-INF/resources/","classpath:/resources/","classpath:/static/","file:" + uploadPath);;
registry.addResourceHandler("/preview/**");
}
@Override

2
smart-admin-api/sa-common/src/main/resources/banner.txt
View File

@@ -12,7 +12,7 @@
SmartAdmin v2.X ，作者：1024创新实验室 @copyright：【 1024lab 】
SmartAdmin 文档地址：https://smartadmin.1024lab.net
SmartAdmin 文档地址：https://smartadmin.vip
1024创新实验室：https://www.1024lab.net