From d64638b31a3884330561a76684b658af852ff90c Mon Sep 17 00:00:00 2001 From: yyhouc <792163605@qq.com> Date: Tue, 23 May 2023 17:21:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=B9=E5=BC=8F=E4=B8=8E=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/auth/SystemManagerApplication.java | 3 ++- .../auth/system/controller/DictBizController.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/kn-sys-manager/src/main/java/org/springblade/auth/SystemManagerApplication.java b/kn-sys-manager/src/main/java/org/springblade/auth/SystemManagerApplication.java index ec350bf..be9fef3 100644 --- a/kn-sys-manager/src/main/java/org/springblade/auth/SystemManagerApplication.java +++ b/kn-sys-manager/src/main/java/org/springblade/auth/SystemManagerApplication.java @@ -18,7 +18,8 @@ import org.springframework.context.annotation.ComponentScan; public class SystemManagerApplication { public static void main(String[] args) { - BladeApplication.run(CommonConstant.KN_SYSTEM_MANAGER_MODULE_NAME, SystemManagerApplication.class, args); + BladeApplication.run("yyhouc-"+ + CommonConstant.KN_SYSTEM_MANAGER_MODULE_NAME, SystemManagerApplication.class, args); } } diff --git a/kn-sys-manager/src/main/java/org/springblade/auth/system/controller/DictBizController.java b/kn-sys-manager/src/main/java/org/springblade/auth/system/controller/DictBizController.java index 1ba0ca8..20eda9b 100644 --- a/kn-sys-manager/src/main/java/org/springblade/auth/system/controller/DictBizController.java +++ b/kn-sys-manager/src/main/java/org/springblade/auth/system/controller/DictBizController.java @@ -68,7 +68,7 @@ public class DictBizController { @ApiOperationSupport(order = 2) @ApiOperation(value = "列表", notes = "传入dict") public R> list(@ApiIgnore @RequestParam Map dict) { - List list = dictService.list(Condition.getQueryWrapper(dict, DictBiz.class).lambda().orderByAsc(DictBiz::getSort)); + List list = dictService.list(Condition.getQueryWrapper(dict, DictBiz.class).lambda().orderByAsc(DictBiz::getSort).eq(DictBiz::getIsDeleted, "0")); return R.data(DictBizWrapper.build().listNodeVO(list)); } @@ -183,7 +183,13 @@ public class DictBizController { dictBiz.setId(null); //添加父子关系 dictBiz.setParentId(dict.getId()); - dictBiz.setCode(dict.getDictKey()); + //如果是根节点，设置code使用根节点的key + if(dict.getParentId()==0){ + dictBiz.setCode(dict.getDictKey()); + //否则使用父节点的code + }else{ + dictBiz.setCode(dict.getCode()); + } } return R.success(dictService.saveBatch(list)||list.size()==0?"操作成功":"操作失败"); } From 5e850cb6dcf5d89c7f2bc4f291513448c30a49f6 Mon Sep 17 00:00:00 2001 From: yyhouc <792163605@qq.com> Date: Tue, 23 May 2023 17:22:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=B9=E5=BC=8F=E4=B8=8E=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/auth/SystemManagerApplication.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kn-sys-manager/src/main/java/org/springblade/auth/SystemManagerApplication.java b/kn-sys-manager/src/main/java/org/springblade/auth/SystemManagerApplication.java index be9fef3..ec350bf 100644 --- a/kn-sys-manager/src/main/java/org/springblade/auth/SystemManagerApplication.java +++ b/kn-sys-manager/src/main/java/org/springblade/auth/SystemManagerApplication.java @@ -18,8 +18,7 @@ import org.springframework.context.annotation.ComponentScan; public class SystemManagerApplication { public static void main(String[] args) { - BladeApplication.run("yyhouc-"+ - CommonConstant.KN_SYSTEM_MANAGER_MODULE_NAME, SystemManagerApplication.class, args); + BladeApplication.run(CommonConstant.KN_SYSTEM_MANAGER_MODULE_NAME, SystemManagerApplication.class, args); } } From c27a1aac3270722adc1015e51b5c7e263892c320 Mon Sep 17 00:00:00 2001 From: glj Date: Tue, 23 May 2023 18:06:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kening/vordm/service/impl/OtherDataServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java index ab44c48..bde7efa 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java @@ -81,6 +81,7 @@ public class OtherDataServiceImpl extends ServiceImpl link = new ArrayList<>(); //文件大小