Merge pull request #208 from dataease/pr@dev@fix_组织名称验重

fix: 组织名称验重
This commit is contained in:
fit2cloud-chenyw 2021-07-12 14:56:56 +08:00 committed by GitHub
commit d02f249b8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 7 deletions

View File

@ -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);
}

View File

@ -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',

View File

@ -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: '站內消息通知',

View File

@ -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: '站内消息通知',