From e706b848e0a32628e869b312bb5d1557d0030dcc Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 10 七月 2024 18:07:31 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java
index 9bc426b..f94e15f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/irrigateGroup/IrrigateGroupCtrl.java
@@ -382,7 +382,7 @@
}
Long groupId = Long.parseLong(po.get("groupId").toString());
Long operator = Long.parseLong(po.get("operator").toString());
- List<Long> newUnitIds = (List<Long>) po.get("unitIds");
+ List<String> newUnitIds = (List<String>) po.get("unitIds");
List<Long> oldUnitIds = irrigateGroupSv.getGroupBindUnits(groupId);
IrGroupUnit irGroupUnit = new IrGroupUnit();
@@ -400,7 +400,7 @@
}
}
for (int i = 0; i < newUnitIds.size(); i++) {
- Long newUnitId = newUnitIds.get(i);
+ Long newUnitId = Long.parseLong(newUnitIds.get(i));
if (!oldUnitIds.toString().contains(newUnitId.toString())) {
irGroupUnit.setUnitId(newUnitId);
Integer rec = Optional.ofNullable(irrigateGroupSv.addGroupUnit(irGroupUnit)).orElse(0);
--
Gitblit v1.8.0