bonus
/
Bonus-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
jiang 2024-08-09 17:40:13 +08:00
parent e3fa18fbcd 099e668d55
commit b0cdb30386
3 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/config/WebMvcConfig.java
View File

@ -1,6 +1,6 @@
package com.bonus.common.security.config;
import com.bonus.common.security.interceptor.ParamSecureHandler;
//import com.bonus.common.security.interceptor.ParamSecureHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@ -23,11 +23,11 @@ public class WebMvcConfig implements WebMvcConfigurer
.addPathPatterns("/**")
.excludePathPatterns(EXCLUDEURLS)
.order(-10);
//自定义拦截器
registry.addInterceptor(getParamSecureInterceptor())
.addPathPatterns("/**")
.excludePathPatterns(EXCLUDEURLS)
.order(-10);
// //自定义拦截器
// registry.addInterceptor(getParamSecureInterceptor())
// .addPathPatterns("/**")
// .excludePathPatterns(EXCLUDEURLS)
// .order(-10);
}
/**
@ -42,9 +42,9 @@ public class WebMvcConfig implements WebMvcConfigurer
/**
* 自定义参数拦截器
*/
public ParamSecureHandler getParamSecureInterceptor()
{
return new ParamSecureHandler();
}
// public ParamSecureHandler getParamSecureInterceptor()
// {
// return new ParamSecureHandler();
// }
}

2
bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
View File

@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND status = #{status}
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
<include refid="com.bonus.system.mapper.DataScopeMapper.dataScopeFilter"/>
order by d.parent_id, d.order_num
</select>

8
bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -116,8 +116,8 @@
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},
ancestors) ))
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
<include refid="com.bonus.system.mapper.DataScopeMapper.dataScopeFilter"/>
</select>
<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
@ -134,7 +134,7 @@
AND u.phonenumber like concat('%', #{phonenumber}, '%')
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
<include refid="com.bonus.system.mapper.DataScopeMapper.dataScopeFilter"/>
</select>
<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
@ -153,7 +153,7 @@
AND u.phonenumber like concat('%', #{phonenumber}, '%')
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
<include refid="com.bonus.system.mapper.DataScopeMapper.dataScopeFilter"/>
</select>
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">