Merge remote-tracking branch 'origin/v1.0' into v1.0

src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java

@@ -487,14 +487,14 @@ public class BmsChannelPointController {
         /** ----------------------------------------------------------------------------------- */
         /** -------------------------------  删除数据  ------------------------------------------------ */
         if(deleteList.size()>0) {
-            List<BmsChannelPoint> deleteBmsChannelPoints = updateList.stream().map(a -> {
+            List<BmsChannelPoint> deleteBmsChannelPoints = deleteList.stream().map(a -> {
                 BmsChannelPoint bmsChannel = new BmsChannelPoint();
                 CopierUtil.copy(a, bmsChannel);
                 return bmsChannel;
             }).collect(Collectors.toList());
-            List<String> updateCodes = deleteBmsChannelPoints.stream().map(a -> a.getPointCode()).collect(Collectors.toList());
+            List<String> deleteCodes = deleteBmsChannelPoints.stream().map(a -> a.getPointCode()).collect(Collectors.toList());
             LambdaQueryWrapper<BmsChannelPoint> bmsChannelLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            bmsChannelLambdaQueryWrapper.in(BmsChannelPoint::getPointCode, updateCodes);
+            bmsChannelLambdaQueryWrapper.in(BmsChannelPoint::getPointCode, deleteCodes);
             List<BmsChannelPoint> oriBmsChannelList = bmsChannelPointService.list(bmsChannelLambdaQueryWrapper);
             Map<String, Long> codeToChannelId = oriBmsChannelList.stream().collect(Collectors.toMap(BmsChannelPoint::getPointCode, BmsChannelPoint::getId));
             deleteBmsChannelPoints = deleteBmsChannelPoints.stream().map(a -> {