From bab515e6ecfb16c042d455fdd2f042b2fd277dda Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 11 十月 2023 00:43:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java index b335410..69e569d 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java @@ -145,6 +145,7 @@ List<CodeClassifyValueVO> codeClassifyValueVOS= codeClassifyValueService.listCodeClassifyValueBySecOid(secOid,parentClassifyValueOid); return R.data(codeClassifyValueVOS); } + /** * 涓婚搴撳垎绫绘爲 * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄 @@ -152,7 +153,7 @@ */ @GetMapping("/treeCodeClassify") public R<List<Tree>> treeCodeClassify(TreeQueryObject treeQueryObject) { - List<Tree> treeList= codeClassifyService. treeCodeClassify(treeQueryObject); + List<Tree> treeList = codeClassifyService.treeCodeClassify(treeQueryObject); return R.data(treeList); } @@ -251,6 +252,6 @@ Map<String,String> codtionMap=new HashMap<>(); codtionMap.put("oid",oid); codtionMap.put("classifyGroupCode",classifyGroupCode); - return R.data(mdmEngineService.checkGroupCode(codtionMap)); + return mdmEngineService.checkGroupCode(codtionMap); } } -- Gitblit v1.9.3