From 1443158933f220613b43f18a2108a552ea9f1aff Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 11 十一月 2024 16:35:54 +0800
Subject: [PATCH] 调整语法不兼容
---
src/main/java/com/whyc/service/PwrDevAlarmParamForSXService.java | 1 +
src/main/resources/mapper/BattInfMapper.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/PwrDevAlarmParamForSXService.java b/src/main/java/com/whyc/service/PwrDevAlarmParamForSXService.java
index 49a8c97..4e9372e 100644
--- a/src/main/java/com/whyc/service/PwrDevAlarmParamForSXService.java
+++ b/src/main/java/com/whyc/service/PwrDevAlarmParamForSXService.java
@@ -37,6 +37,7 @@
//鏇存柊鐢垫簮鍗曟潯鍛婅
public Response updatePwrAlarm(PwrDevAlarmParamForSX pwrAlarm) {
+ pwrAlarm.setNum(null);
UpdateWrapper wrapper = new UpdateWrapper();
wrapper.eq("PowerDeviceId", pwrAlarm.getPowerDeviceId());
wrapper.eq("alm_id", pwrAlarm.getAlarmId());
diff --git a/src/main/resources/mapper/BattInfMapper.xml b/src/main/resources/mapper/BattInfMapper.xml
index c0882a0..54b48ac 100644
--- a/src/main/resources/mapper/BattInfMapper.xml
+++ b/src/main/resources/mapper/BattInfMapper.xml
@@ -202,7 +202,7 @@
db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id
and db_user.tb_user_battgroup_baojigroup_usr.uId = #{userId}
)
- ORDER BY db_battinf.tb_battinf.stationname1, db_battinf.tb_battinf.BattGroupId
+ ORDER BY db_battinf.tb_battinf.stationname
</select>
<insert id="insertUserBattgroupBaojigroupBattgroup">
--
Gitblit v1.9.1