Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
66914147
Commit
66914147
authored
Jan 10, 2022
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1,修改权限参数不能解析mybatisplus参数调整
parent
e9758a08
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
10 deletions
+24
-10
ControllerAop.java
...a/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java
+3
-0
OrgUsrMapper.java
...join/amos/boot/module/common/api/mapper/OrgUsrMapper.java
+2
-0
OrgUsrMapper.xml
...ule-common-api/src/main/resources/mapper/OrgUsrMapper.xml
+15
-0
OrgUsrServiceImpl.java
...oot/module/common/biz/service/impl/OrgUsrServiceImpl.java
+4
-10
No files found.
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java
View file @
66914147
...
...
@@ -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
();
// 不需要添加请求头的接口
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java
View file @
66914147
...
...
@@ -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
);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml
View file @
66914147
...
...
@@ -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>
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @
66914147
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment