From 38d59c9e0727c5e5a6fc01b2cb846d591cd6c008 Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Wed, 15 May 2024 09:29:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=8E=8B=E4=B8=BA=E7=A9=BA=E7=9A=84bu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/shxy/xymanager_common/vo/LineVo.java | 2 +- .../main/java/com/shxy/xymanager_common/vo/UpdateLineVo.java | 2 +- .../com/shxy/xymanager_service/impl/DyLevelServiceImpl.java | 3 ++- .../java/com/shxy/xymanager_service/impl/LineServiceImpl.java | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/LineVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/LineVo.java index 775715f..09e9280 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/LineVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/LineVo.java @@ -27,7 +27,7 @@ public class LineVo { @ApiModelProperty(value = "电压等级编号", example = "型号型号") @NotBlank(message = "电压编号不能缺少") - private Integer dyLevelid; + private Integer dyLevelId; } } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateLineVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateLineVo.java index 64b134d..70cb40f 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateLineVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateLineVo.java @@ -23,6 +23,6 @@ public class UpdateLineVo { @ApiModelProperty(value = "电压等级编号", example = "型号型号") @NotNull(message = "电压编号不能缺少") - private Integer dyLevelid; + private Integer dyLevelId; } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java index 1f53344..654f414 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java @@ -379,7 +379,8 @@ public class DyLevelServiceImpl implements DyLevelService { View_Dy_Line_Tower_TerminalsExample.Criteria or2 = example.or(); or2.andDyIdEqualTo(dyid); } - + View_Dy_Line_Tower_TerminalsExample.Criteria or1 = example.or(); + or1.andDyIdIsNotNull(); PageUtils.SetPage(pageindex, pagesize); List list = view_dy_line_tower_terminalsDao.selectByPermission(example); ArrayList dylist = new ArrayList<>(); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java index dc48dd3..4c6a1e6 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java @@ -211,7 +211,7 @@ public class LineServiceImpl implements LineService { lines.setId(vo.getId()); lines.setName(vo.getName()); lines.setBsManufacturer(vo.getBsManufacturer()); - lines.setDyLevelId(vo.getDyLevelid()); + lines.setDyLevelId(vo.getDyLevelId()); lines.setUpdateTime(new Date()); int i = linesDao.updateByPrimaryKeySelective(lines); if (i != 0) {