Commit 47d307ac authored by chenhao's avatar chenhao

修改bug 2589

parent 3721a707
...@@ -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="linkageUnitTypeCode != null and linkageUnitTypeCode != ''"> test="linkageUnitType != null and linkageUnitType != ''">
AND clu.linkage_unit_type_code =#{linkageUnitTypeCode} AND clu.linkage_unit_type =#{linkageUnitType}
</if> </if>
<if <if
test="emergencyLinkageUnitCode != null and emergencyLinkageUnitCode != ''"> test="emergencyLinkageUnitCode != null and emergencyLinkageUnitCode != ''">
......
...@@ -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 linkageUnitTypeCode, 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, linkageUnitTypeCode, emergencyLinkageUnitCode,inAgreement); unitName, linkageUnitType, emergencyLinkageUnitCode,inAgreement);
return ResponseHelper.buildResponse(linkageUnitDtoPage); return ResponseHelper.buildResponse(linkageUnitDtoPage);
} }
......
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