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
6d4b8777
Commit
6d4b8777
authored
Sep 22, 2021
by
高建强
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
item:接口getUserInfo条件修改为IN查询
parent
3b77a1d7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
5 deletions
+8
-5
OrgUsrMapper.java
...join/amos/boot/module/common/api/mapper/OrgUsrMapper.java
+1
-1
OrgUsrMapper.xml
...ule-common-api/src/main/resources/mapper/OrgUsrMapper.xml
+5
-2
OrgUsrServiceImpl.java
...oot/module/common/biz/service/impl/OrgUsrServiceImpl.java
+2
-2
No files found.
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 @
6d4b8777
...
...
@@ -74,7 +74,7 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
List
<
UserUnitDto
>
getUserUnit
(
String
id
,
String
type
,
String
code
);
List
<
UserDto
>
getUserInfo
(
String
id
,
String
type
,
String
code
,
String
fieldCode
);
List
<
UserDto
>
getUserInfo
(
String
id
,
String
type
,
String
code
,
String
[]
fieldCode
);
/**
* 导出机场单位带过滤 bug2657 by kongfm
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml
View file @
6d4b8777
...
...
@@ -443,8 +443,11 @@ GROUP BY
<if
test=
"code != null and code != ''"
>
AND u.biz_org_code LIKE CONCAT(#{code}, '%')
</if>
<if
test=
"fieldCode != null and fieldCode != ''"
>
AND f.field_code IN ( #{fieldCode})
<if
test=
"fieldCode != null and fieldCode.length > 0"
>
AND fi.field_code IN
<foreach
collection=
"fieldCode"
item=
"item"
index=
"index"
open=
"("
close=
")"
separator=
","
>
#{item}
</foreach>
</if>
</where>
ORDER BY
...
...
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 @
6d4b8777
...
...
@@ -1190,14 +1190,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
if
(
StringUtils
.
isNotBlank
(
userId
))
{
String
[]
typeArr
=
TYPE
.
split
(
","
);
// 业主单位
List
<
UserDto
>
list
=
orgUsrMapper
.
getUserInfo
(
userId
,
typeArr
[
0
],
null
,
FIELD_CODE
);
List
<
UserDto
>
list
=
orgUsrMapper
.
getUserInfo
(
userId
,
typeArr
[
0
],
null
,
FIELD_CODE
.
split
(
","
)
);
if
(!
CollectionUtils
.
isEmpty
(
list
))
{
if
(
list
.
size
()
==
1
)
{
userDtoList
.
addAll
(
list
);
UserDto
userDto
=
list
.
get
(
0
);
String
codeVal
=
userDto
.
getBizOrgCode
().
substring
(
0
,
5
);
if
(
StringUtils
.
isNotBlank
(
codeVal
))
{
List
<
UserDto
>
dtoList
=
orgUsrMapper
.
getUserInfo
(
null
,
typeArr
[
1
],
codeVal
,
COMPANY_FIELD_CODE
);
List
<
UserDto
>
dtoList
=
orgUsrMapper
.
getUserInfo
(
null
,
typeArr
[
1
],
codeVal
,
COMPANY_FIELD_CODE
.
split
(
","
)
);
if
(!
CollectionUtils
.
isEmpty
(
dtoList
))
{
userDtoList
.
addAll
(
dtoList
);
}
...
...
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