Commit 66914147 authored by suhuiguang's avatar suhuiguang

1,修改权限参数不能解析mybatisplus参数调整

parent e9758a08
......@@ -5,6 +5,8 @@ import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptor;
import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
......@@ -64,6 +66,7 @@ public class ControllerAop {
@Before("userCache()")
public void doBefore(JoinPoint joinPoint) {
PermissionInterceptorContext.clean();
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = attributes.getRequest();
// 不需要添加请求头的接口
......
......@@ -107,4 +107,6 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
@DataAuth(interfacePath="")
List<OrgUsr> companyDeptListWithPersonCount(Map<String, Object> param);
List<OrgUsr> listByOrgTypes(@Param("orgTypeList") List<String> orgTypeList,@Param("bizOrgCode") String bizOrgCode);
}
......@@ -781,4 +781,19 @@ LEFT JOIN (
(usr.biz_org_type = 'COMPANY' OR usr.biz_org_type = 'DEPARTMENT')
and usr.is_delete = false
</select>
<select id="listByOrgTypes" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
select
*
from
cb_org_usr usr
where
usr.is_delete = false
<if test="orgTypeList != null and orgTypeList.size > 0 ">
and usr.biz_org_type in
<foreach collection="orgTypeList" item="bizOrgType" open="(" close=")" separator=",">
#{bizOrgType}
</foreach>
</if>
order by usr.rec_date
</select>
</mapper>
......@@ -2080,17 +2080,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
@Override
public List<OrgUsr> getListByBizOrgTypeCode(String orgTypes, String orgCode) {
LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(OrgUsr::getIsDelete, false);
if (!StringUtils.isEmpty(orgTypes)) {
List<String> orgUserIdList = Lists.newArrayList(orgTypes.split(","));
wrapper.in(OrgUsr::getBizOrgType, orgUserIdList);
List<String> orgTypeList = new ArrayList<>();
if (StringUtils.isNotBlank(orgTypes)) {
orgTypeList = Arrays.asList(orgTypes.split(","));
}
if (!StringUtils.isEmpty(orgCode)) {
wrapper.likeRight(OrgUsr::getBizOrgCode, orgCode);
}
wrapper.orderByAsc(BaseEntity::getRecDate);
return this.baseMapper.selectList(wrapper);
return this.getBaseMapper().listByOrgTypes(orgTypeList, orgCode);
}
@Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment