From 4749e486563a1717fd6ffc06636dad44f3c2cfc1 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Thu, 3 Mar 2022 17:22:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=86=85=E5=AE=B9-=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/controller/SysDictController.java | 10 +++++----- .../system/controller/SysDictItemController.java | 1 - .../system/service/impl/SysDictServiceImpl.java | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 1a044dc08..57dac6ae4 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -359,12 +359,14 @@ public class SysDictController { try { Integer count = sysDictService.queryExitData(sysDict); System.out.println("count="+count); + if (count > 0) { sysDict.setDelFlag(CommonConstant.DEL_FLAG_0); - System.out.println(); } else { - String pinYin = HanYuPinYinUtil.changeToNumberPinYin(sysDict.getDictName()); - sysDict.setDictCode(pinYin); + if(sysDict.getIsTagDict() == 1){ + String pinYin = HanYuPinYinUtil.changeToNumberPinYin(sysDict.getDictName()); + sysDict.setDictCode(pinYin); + } sysDict.setCreateTime(new Date()); sysDict.setDelFlag(CommonConstant.DEL_FLAG_0); sysDictService.save(sysDict); @@ -398,8 +400,6 @@ public class SysDictController { result.error500("固定字段,不可修改"); }else{ sysDict.setUpdateTime(new Date()); - String pinYin = HanYuPinYinUtil.changeToNumberPinYin(sysDict.getDictName()); - sysDict.setDictCode(pinYin); boolean ok = sysDictService.updateById(sysDict); if (ok) { result.success("编辑成功!"); 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 97f0c4fb7..9425d336c 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 @@ -105,7 +105,6 @@ public class SysDictItemController { } else { sysDictItem.setUpdateTime(new Date()); boolean ok = sysDictItemService.updateById(sysDictItem); - //TODO 返回false说明什么？ if (ok) { result.success("编辑成功!"); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java index 73b2c7021..6a90a310e 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java @@ -198,7 +198,7 @@ public class SysDictServiceImpl extends ServiceImpl impl @Override public List queryDictName(SysDict sysDict) { QueryWrapper QueryWrapper = new QueryWrapper<>(); - QueryWrapper.select("id", "dict_name"); + QueryWrapper.select("id", "dict_name").eq("is_tag_dict",1); return list(QueryWrapper); }