diff --git a/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java b/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java index d6fc4657b7..4a6c0bb6f1 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java @@ -55,9 +55,9 @@ public class XDeptServer { } @PostMapping("/create") - public void create(@RequestBody XpackCreateDept dept){ + public int create(@RequestBody XpackCreateDept dept){ DeptXpackService deptService = SpringContextUtil.getBean(DeptXpackService.class); - deptService.add(dept); + return deptService.add(dept); } @PostMapping("/delete") @@ -67,9 +67,9 @@ public class XDeptServer { } @PostMapping("/update") - public void update(@RequestBody XpackCreateDept dept){ + public int update(@RequestBody XpackCreateDept dept){ DeptXpackService deptService = SpringContextUtil.getBean(DeptXpackService.class); - deptService.update(dept); + return deptService.update(dept); } diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 30dd307643..1a2c366a27 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1231,7 +1231,10 @@ export default { dept: { can_not_move_change_sort: 'Cannot move to change sort', can_not_move_parent_to_children: 'Parent organization cannot move to its own child node', - move_success: 'Mobile success' + move_success: 'Mobile success', + name_exist_pre: 'already existed organization named [', + name_exist_suf: ']', + root_org: 'Top organization' }, webmsg: { web_msg: 'On site message notification', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 592b77e6ee..5105a00ad0 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1231,7 +1231,10 @@ export default { dept: { can_not_move_change_sort: '不能移動以改變排序', can_not_move_parent_to_children: '父組織不能移動到自己的子節點下', - move_success: '移動成功' + move_success: '移動成功', + name_exist_pre: '下已存在名稱為【', + name_exist_suf: '】的組織', + root_org: '頂層組織' }, webmsg: { web_msg: '站內消息通知', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 666b6f66e4..dd198f72fd 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1233,7 +1233,10 @@ export default { dept: { can_not_move_change_sort: '不能移动以改变排序', can_not_move_parent_to_children: '父组织不能移动到自己的子节点下', - move_success: '移动成功' + move_success: '移动成功', + name_exist_pre: '下已存在名称为【', + name_exist_suf: '】的组织', + root_org: '顶层组织' }, webmsg: { web_msg: '站内消息通知',