From 9fecec238af35927fc22b3efbf3413128c2901f8 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Wed, 28 Feb 2024 10:19:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xinelu/manage/controller/agency/AgencyController.java | 4 ++-- .../agencycategory/impl/AgencyCategoryServiceImpl.java | 3 +++ .../manage/vo/agencycategory/AgencyCategoryTreeVO.java | 6 +++--- .../xinelu/manage/vo/agencycategory/AgencyCategoryVO.java | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java index 6a2eba1b..bf4c094b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java @@ -68,7 +68,7 @@ public class AgencyController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:agency:add')") @Log(title = "机构信息", businessType = BusinessType.INSERT) - @PostMapping("/add") + @PostMapping public AjaxResult add(@RequestBody Agency agency) { return toAjax(agencyService.insertAgency(agency)); } @@ -78,7 +78,7 @@ public class AgencyController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:agency:edit')") @Log(title = "机构信息", businessType = BusinessType.UPDATE) - @PutMapping("/edit") + @PutMapping public AjaxResult edit(@RequestBody Agency agency) { return toAjax(agencyService.updateAgency(agency)); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agencycategory/impl/AgencyCategoryServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agencycategory/impl/AgencyCategoryServiceImpl.java index 23af9515..c342ddf1 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agencycategory/impl/AgencyCategoryServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agencycategory/impl/AgencyCategoryServiceImpl.java @@ -114,6 +114,9 @@ public class AgencyCategoryServiceImpl implements IAgencyCategoryService { @Override public List agencyCategoryList() { List agencyCategoryList = agencyCategoryMapper.selectAgencyCategoryVOList(null); + for (AgencyCategoryVO agencyCategory : agencyCategoryList) { + agencyCategory.setValue(agencyCategory.getId()); + } List agencyTree = buildDeptTree(agencyCategoryList); return agencyTree.stream().map(AgencyCategoryTreeVO::new).collect(Collectors.toList()); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agencycategory/AgencyCategoryTreeVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agencycategory/AgencyCategoryTreeVO.java index af1224ae..e871080b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agencycategory/AgencyCategoryTreeVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agencycategory/AgencyCategoryTreeVO.java @@ -20,7 +20,7 @@ public class AgencyCategoryTreeVO implements Serializable { */ private String label; - private String value; + private Long value; /** * 子节点 @@ -51,11 +51,11 @@ public class AgencyCategoryTreeVO implements Serializable { this.label = label; } - public String getValue() { + public Long getValue() { return value; } - public void setValue(String value) { + public void setValue(Long value) { this.value = value; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agencycategory/AgencyCategoryVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agencycategory/AgencyCategoryVO.java index b4062f1f..67bf5231 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agencycategory/AgencyCategoryVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agencycategory/AgencyCategoryVO.java @@ -11,7 +11,7 @@ import java.util.List; @Data public class AgencyCategoryVO extends AgencyCategory { - private String value; + private Long value; private List children = new ArrayList();