From 9f215ade260e30382ef39ec09bd2c9128e591448 Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Mon, 11 Sep 2023 18:32:38 +0800
Subject: [PATCH] =?UTF-8?q?#=20=E7=AB=99=E7=82=B9=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BF=9D=E5=AD=98=E5=A4=B1=E8=B4=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../station/service/impl/StationServiceImpl.java   | 55 +++++++++++-----------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java
index 9e1a89f..79997f8 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java
@@ -91,7 +91,8 @@ public class StationServiceImpl extends BaseServiceImpl<StationMapper, StationEn
         });
         Optional<Integer> sort = Optional.ofNullable(this.getStationMaxOrder());
         req.setSort(sort.isPresent() ? sort.get() + 1 : 1);
-        Assert.isTrue(this.saveOrUpdate(req), () -> {
+        boolean updateResult = this.saveOrUpdate(req);
+        Assert.isTrue(updateResult, () -> {
             throw new ServiceException("创建/修改站点信息失败！");
         });
         this.pushStation(req);
@@ -229,32 +230,32 @@ public class StationServiceImpl extends BaseServiceImpl<StationMapper, StationEn
         return userList;
     }
 
-    @Override
-    public boolean updateById(StationEntity req) {
-        return super.update(Wrappers.<StationEntity>lambdaUpdate()
-                .set(StationEntity::getCode, req.getCode())
-                .set(StationEntity::getName, req.getName())
-                .set(StationEntity::getType, req.getType())
-                .set(StationEntity::getCommissionTime, req.getCommissionTime())
-                .set(StationEntity::getEnableControl, req.getEnableControl())
-                .set(StationEntity::getLgtd, req.getLgtd())
-                .set(StationEntity::getLttd, req.getLttd())
-                .set(StationEntity::getRefDept, req.getRefDept())
-                .set(StationEntity::getAreaCode, req.getAreaCode())
-                .set(StationEntity::getRefDomain, req.getRefDomain())
-                .set(StationEntity::getRefBasin, req.getRefBasin())
-                .set(StationEntity::getRefArea, req.getRefArea())
-                .set(StationEntity::getRemark, req.getRemark())
-                .set(StationEntity::getPic, req.getPic())
-                .set(StationEntity::getContact, req.getContact())
-                .set(StationEntity::getContactor, req.getContactor())
-                .set(StationEntity::getAddress, req.getAddress())
-                .set(StationEntity::getCompany, req.getCompany())
-                .set(StationEntity::getCreateDept, req.getCreateDept())
-                .set(StationEntity::getServeType, req.getServeType())
-                .set(StationEntity::getLimitWaterLevel, req.getLimitWaterLevel())
-                .eq(StationEntity::getId, req.getId()));
-    }
+//    @Override
+//    public boolean updateById(StationEntity req) {
+//        return super.update(Wrappers.<StationEntity>lambdaUpdate()
+//                .set(StationEntity::getCode, req.getCode())
+//                .set(StationEntity::getName, req.getName())
+//                .set(StationEntity::getType, req.getType())
+//                .set(StationEntity::getCommissionTime, req.getCommissionTime())
+//                .set(StationEntity::getEnableControl, req.getEnableControl())
+//                .set(StationEntity::getLgtd, req.getLgtd())
+//                .set(StationEntity::getLttd, req.getLttd())
+//                .set(StationEntity::getRefDept, req.getRefDept())
+//                .set(StationEntity::getAreaCode, req.getAreaCode())
+//                .set(StationEntity::getRefDomain, req.getRefDomain())
+//                .set(StationEntity::getRefBasin, req.getRefBasin())
+//                .set(StationEntity::getRefArea, req.getRefArea())
+//                .set(StationEntity::getRemark, req.getRemark())
+//                .set(StationEntity::getPic, req.getPic())
+//                .set(StationEntity::getContact, req.getContact())
+//                .set(StationEntity::getContactor, req.getContactor())
+//                .set(StationEntity::getAddress, req.getAddress())
+//                .set(StationEntity::getCompany, req.getCompany())
+//                .set(StationEntity::getCreateDept, req.getCreateDept())
+//                .set(StationEntity::getServeType, req.getServeType())
+//                .set(StationEntity::getLimitWaterLevel, req.getLimitWaterLevel())
+//                .eq(StationEntity::getId, req.getId()));
+//    }
 
 
     @Override