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
47d307ac
Commit
47d307ac
authored
Aug 25, 2021
by
chenhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug 2589
parent
3721a707
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
LinkageUnitMapper.xml
...ommon-api/src/main/resources/mapper/LinkageUnitMapper.xml
+2
-2
LinkageUnitController.java
...t/module/common/biz/controller/LinkageUnitController.java
+2
-2
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/LinkageUnitMapper.xml
View file @
47d307ac
...
@@ -185,8 +185,8 @@
...
@@ -185,8 +185,8 @@
AND clu.unit_name LIKE concat(#{unitName}, '%')
AND clu.unit_name LIKE concat(#{unitName}, '%')
</if>
</if>
<if
<if
test=
"linkageUnitType
Code != null and linkageUnitTypeCod
e != ''"
>
test=
"linkageUnitType
!= null and linkageUnitTyp
e != ''"
>
AND clu.linkage_unit_type
_code =#{linkageUnitTypeCod
e}
AND clu.linkage_unit_type
=#{linkageUnitTyp
e}
</if>
</if>
<if
<if
test=
"emergencyLinkageUnitCode != null and emergencyLinkageUnitCode != ''"
>
test=
"emergencyLinkageUnitCode != null and emergencyLinkageUnitCode != ''"
>
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/LinkageUnitController.java
View file @
47d307ac
...
@@ -123,12 +123,12 @@ public class LinkageUnitController extends BaseController {
...
@@ -123,12 +123,12 @@ public class LinkageUnitController extends BaseController {
@GetMapping
(
value
=
"/page"
)
@GetMapping
(
value
=
"/page"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"联动单位分页查询"
,
notes
=
"联动单位分页查询"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"联动单位分页查询"
,
notes
=
"联动单位分页查询"
)
public
ResponseModel
<
Page
<
LinkageUnitDto
>>
queryForPage
(
@RequestParam
(
value
=
"current"
)
int
current
,
@RequestParam
public
ResponseModel
<
Page
<
LinkageUnitDto
>>
queryForPage
(
@RequestParam
(
value
=
"current"
)
int
current
,
@RequestParam
(
value
=
"size"
)
int
size
,
String
unitName
,
String
linkageUnitType
Code
,
String
inAgreement
,
String
emergencyLinkageUnitCode
)
{
(
value
=
"size"
)
int
size
,
String
unitName
,
String
linkageUnitType
,
String
inAgreement
,
String
emergencyLinkageUnitCode
)
{
Page
<
LinkageUnitDto
>
page
=
new
Page
<
LinkageUnitDto
>();
Page
<
LinkageUnitDto
>
page
=
new
Page
<
LinkageUnitDto
>();
page
.
setCurrent
(
current
);
page
.
setCurrent
(
current
);
page
.
setSize
(
size
);
page
.
setSize
(
size
);
Page
<
LinkageUnitDto
>
linkageUnitDtoPage
=
linkageUnitServiceImpl
.
queryForLinkageUnitPage
(
page
,
false
,
Page
<
LinkageUnitDto
>
linkageUnitDtoPage
=
linkageUnitServiceImpl
.
queryForLinkageUnitPage
(
page
,
false
,
unitName
,
linkageUnitType
Code
,
emergencyLinkageUnitCode
,
inAgreement
);
unitName
,
linkageUnitType
,
emergencyLinkageUnitCode
,
inAgreement
);
return
ResponseHelper
.
buildResponse
(
linkageUnitDtoPage
);
return
ResponseHelper
.
buildResponse
(
linkageUnitDtoPage
);
}
}
...
...
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