diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 0a360f37e..4f2230b87 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -84,7 +84,7 @@ public class SysDictItemController { @CacheEvict(value= CacheConstant.SYS_DICT_CACHE, allEntries=true) public Result add(@RequestBody SysDictItem sysDictItem) { Result result = new Result(); - sysDictItemService.setAddOrdderNum(sysDictItem); + sysDictItemService.setAddOrderNum(sysDictItem); //查询同名数据 List exitDictItemList = sysDictItemMapper.selctItemByName(sysDictItem.getItemText(),sysDictItem.getDictId()); if(CollectionUtils.isNotEmpty(exitDictItemList)){ diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java index 0d59ef710..f0a161cce 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java @@ -31,7 +31,7 @@ public interface ISysDictItemService extends IService { */ public void updateDictDelFlag(int delFlag,String id); - void setAddOrdderNum(SysDictItem sysDictItem); + void setAddOrderNum(SysDictItem sysDictItem); void setEditOrderNum(SysDictItem sysDictItem); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java index 394f168f3..1a8878f04 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java @@ -57,23 +57,25 @@ public class SysDictItemServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0) .eq("dict_id",sysDictItem.getDictId()) - .orderByAsc("order_num"); - queryWrapper.eq("order_num", inputOrderNum); + .eq("is_tag_dict",sysDictItem.getIsTagDict()) + .orderByAsc("sort_order"); + queryWrapper.eq("sort_order", inputOrderNum); Integer orderNumCount = sysDictItemMapper.selectCount(queryWrapper); if (orderNumCount > 0) {//有重复展示顺序的,后面的号全+1 //设置排序 QueryWrapper orderNumQueryWrapper = new QueryWrapper<>(); - orderNumQueryWrapper.ge("order_num", inputOrderNum) + orderNumQueryWrapper.ge("sort_order", inputOrderNum) .eq("dict_id",sysDictItem.getDictId()) .eq("del_flag", CommonConstant.DEL_FLAG_0) - .orderByAsc("order_num"); + .eq("is_tag_dict",sysDictItem.getIsTagDict()) + .orderByAsc("sort_order"); List geOrderNumList = list(orderNumQueryWrapper); //判断相邻的序号,去掉不邻的 @@ -101,6 +103,7 @@ public class SysDictItemServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0) .eq("dict_id",sysDictItem.getDictId()) + .eq("is_tag_dict",sysDictItem.getIsTagDict()) .orderByAsc("sort_order"); Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysDictItem.getId())) .map(e -> e.getSortOrder()).collect(Collectors.toList()).get(0); @@ -112,6 +115,7 @@ public class SysDictItemServiceImpl extends ServiceImpl geOrderNumList = list(orderNumQueryWrapper); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 7d98957bb..5afc87589 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -148,7 +148,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); - String contentLog = username+"向清单中添加了标准\""+serialNumber+"\""; + String contentLog = username+"向清单中添加了标准“"+serialNumber+"”"; dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId()); } } @@ -167,7 +167,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl infoEOList = new ArrayList<>(); infoEOList.add(dummyInventoryInfoEO); //查询数据库里原来的数据 @@ -234,7 +234,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); - String contentLog = username+"删除了清单中的\""+serialNumber+"\"标准"; + String contentLog = username+"删除了清单中的“"+serialNumber+"”标准"; dummyLogEOService.updateLog(contentLog, projectId); } @@ -287,7 +287,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); - String contentLog = username+"复制了\""+serialNumber+"\""; + String contentLog = username+"复制了“"+serialNumber+"”"; dummyLogEOService.updateLog(contentLog, projectId); } } @@ -303,7 +303,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl