diff --git a/backend/src/main/java/io/metersphere/service/OrganizationService.java b/backend/src/main/java/io/metersphere/service/OrganizationService.java index 0d354c7f3959b864af925c5785a1a54ec74c187a..a88e4f7b31436e253198e33d87fbcb318009e63a 100644 --- a/backend/src/main/java/io/metersphere/service/OrganizationService.java +++ b/backend/src/main/java/io/metersphere/service/OrganizationService.java @@ -123,6 +123,10 @@ public class OrganizationService { list.add(r.getParentId()); } }); + + // ignore list size is 0 + list.add("no_such_id"); + OrganizationExample organizationExample = new OrganizationExample(); organizationExample.createCriteria().andIdIn(list); return organizationMapper.selectByExample(organizationExample); diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue index 44080272a700a24d8b6c4803616c87e1073b7e72..3881cac0c782c8b4f93e29dcc3d5cdd168025788 100644 --- a/frontend/src/business/components/settings/system/User.vue +++ b/frontend/src/business/components/settings/system/User.vue @@ -336,11 +336,11 @@ rule: { id: [ {required: true, message: this.$t('user.input_id'), trigger: 'blur'}, - {min: 2, max: 20, message: this.$t('commons.input_limit', [2, 20]), trigger: 'blur'} + {min: 2, max: 50, message: this.$t('commons.input_limit', [2, 50]), trigger: 'blur'} ], name: [ {required: true, message: this.$t('user.input_name'), trigger: 'blur'}, - {min: 2, max: 20, message: this.$t('commons.input_limit', [2, 20]), trigger: 'blur'}, + {min: 2, max: 50, message: this.$t('commons.input_limit', [2, 50]), trigger: 'blur'}, { required: true, pattern: /^[\u4e00-\u9fa5_a-zA-Z0-9.ยท-]+$/, diff --git a/frontend/src/common/js/ajax.js b/frontend/src/common/js/ajax.js index 3ce85b05e04e4427d6dcf8fcde039ba994982bdb..af0021d005ad9b009d688a77ecc5f3c0324bf26d 100644 --- a/frontend/src/common/js/ajax.js +++ b/frontend/src/common/js/ajax.js @@ -18,6 +18,8 @@ export default { let login = function () { MessageBox.alert(i18n.t('commons.tips'), i18n.t('commons.prompt'), { callback: () => { + axios.get("/signout"); + localStorage.setItem('Admin-Token', "{}"); window.location.href = "/login" } });