From 5aa3f1e57163f66b7294ed9f041f52a58060db21 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 24 Aug 2023 16:20:33 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=96=B0=E5=A2=9E=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tag/service/impl/LawsAreaServiceImpl.java | 62 ------------------- 1 file changed, 62 deletions(-) diff --git a/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/LawsAreaServiceImpl.java b/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/LawsAreaServiceImpl.java index ed681ece..b74ff39d 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/LawsAreaServiceImpl.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/LawsAreaServiceImpl.java @@ -49,37 +49,6 @@ public class LawsAreaServiceImpl extends ServiceImpl i */ @Override public void add(LawsArea lawsArea) { - Integer inputSort = lawsArea.getSort(); - //查询展示顺序相同的 - QueryWrapper queryWrapper= new QueryWrapper<>(); - queryWrapper.orderByAsc("sort"); - queryWrapper.eq("sort", inputSort); - Integer orderNumCount = lawsAreaMapper.selectCount(queryWrapper); - if(orderNumCount > 0) {//有重复展示顺序的,后面的号全+1 - //设置排序 - QueryWrapper orderNumQueryWrapper = new QueryWrapper<>(); - orderNumQueryWrapper.ge("sort", inputSort) - .orderByAsc("sort"); - List geSortList = list(orderNumQueryWrapper); - - //判断相邻的序号,去掉不邻的 - for(int i = 0 ; i <= geSortList.size() ; i++) { - if (geSortList.size()==1){ - break; - }else if (geSortList.get(i + 1).getSort() - geSortList.get(i).getSort() > 1) { - int deleteStart = geSortList.get(i+1).getSort(); - geSortList = geSortList.stream().filter(e->e.getSort() < deleteStart).collect(Collectors.toList()); - break; - } - } - - geSortList.stream().forEach(e -> e.setSort(e.getSort() + 1)); - saveOrUpdateBatch(geSortList); - } - - Date now = new Date(); - lawsArea.setCreateTime(now); - lawsArea.setUpdateTime(now); save(lawsArea); } /** @@ -105,37 +74,6 @@ public class LawsAreaServiceImpl extends ServiceImpl i */ @Override public void editById(LawsArea lawsArea) { - Integer inputSort = lawsArea.getSort(); - //查询展示顺序相同的 - QueryWrapper queryWrapper= new QueryWrapper<>(); - queryWrapper.orderByAsc("sort"); - Integer orderNumData = list(queryWrapper).stream().filter(e->e.getId().equals(lawsArea.getId())) - .map(e -> e.getSort()).collect(Collectors.toList()).get(0); - queryWrapper.eq("sort", inputSort); - Integer orderNumCount = lawsAreaMapper.selectCount(queryWrapper); - if(orderNumCount > 0 && !orderNumData.equals(inputSort)) {//有重复展示顺序的,后面的号全+1 - //设置排序 - QueryWrapper orderNumQueryWrapper = new QueryWrapper<>(); - orderNumQueryWrapper.ge("sort", inputSort) - .orderByAsc("sort"); - List geSortList = list(orderNumQueryWrapper); - - //判断相邻的序号,去掉不邻的 - for(int i = 0 ; i <= geSortList.size() ; i++) { - if (geSortList.size()==1){ - break; - }else if (geSortList.get(i + 1).getSort() - geSortList.get(i).getSort() > 1) { - int deleteStart = geSortList.get(i+1).getSort(); - geSortList = geSortList.stream().filter(e->e.getSort() < deleteStart).collect(Collectors.toList()); - break; - } - } - - geSortList.stream().forEach(e -> e.setSort(e.getSort() + 1)); - saveOrUpdateBatch(geSortList); - } - Date now = new Date(); - lawsArea.setUpdateTime(now); saveOrUpdate(lawsArea); }