From e0cf946d181841c9904c5402dccc6a72f2f0fd0d Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Wed, 9 Dec 2020 17:44:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=98=8E=E7=BB=86=E7=A6=81?= =?UTF-8?q?=E7=94=A8=E6=A0=B7=E5=BC=8F=20=E4=B8=8A=E4=BC=A0=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E7=BB=84=E4=BB=B6=E5=A4=A7=E5=B0=8F=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E9=97=AE=E9=A2=98=20=E6=B3=A8=E5=86=8C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=80=BB=E6=98=AF=E6=8F=90=E7=A4=BA=E2=80=9C=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E9=AA=8C=E8=AF=81=E7=A0=81=E9=94=99=E8=AF=AF=E2=80=9D?= =?UTF-8?q?=20#2081=20=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=9B=B4=E5=A4=9A=E8=AF=B7=E6=B1=82=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=20=E8=8F=9C=E5=8D=95=E5=88=A0=E9=99=A4=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=E5=8F=98=E5=BD=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20=E7=A4=BA=E4=BE=8B=E6=A8=A1=E6=9D=BF=E4=BC=98?= =?UTF-8?q?=E5=8C=96TableInnerEditList.vue=20=E5=BD=93=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=8D=95=E7=A7=9F=E6=88=B7=E5=A4=9A=E9=83=A8=E9=97=A8=E6=97=B6?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=9C=AAsetTenant=E7=9A=84BUG=20#2053?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/jeecg/JImageUpload.vue | 2 +- .../examples/list/TableInnerEditList.vue | 24 ++++++++++++-- .../src/views/jeecg/InterfaceTest.vue | 31 +++++++++---------- .../src/views/jeecg/JeecgDemoList.vue | 8 ++--- .../src/views/system/DictItemList.vue | 17 +++++++++- .../src/views/system/NewPermissionList.vue | 2 +- .../src/views/user/LoginSelectTenant.vue | 4 +-- .../system/controller/SysUserController.java | 10 ++++-- 8 files changed, 67 insertions(+), 31 deletions(-) diff --git a/ant-design-vue-jeecg/src/components/jeecg/JImageUpload.vue b/ant-design-vue-jeecg/src/components/jeecg/JImageUpload.vue index d06aa9e5..004fd44d 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/JImageUpload.vue +++ b/ant-design-vue-jeecg/src/components/jeecg/JImageUpload.vue @@ -15,7 +15,7 @@ @change="handleChange" @preview="handlePreview" :class="!isMultiple?'imgupload':''"> -
+
diff --git a/ant-design-vue-jeecg/src/views/examples/list/TableInnerEditList.vue b/ant-design-vue-jeecg/src/views/examples/list/TableInnerEditList.vue index 3029cf58..db7d9d40 100644 --- a/ant-design-vue-jeecg/src/views/examples/list/TableInnerEditList.vue +++ b/ant-design-vue-jeecg/src/views/examples/list/TableInnerEditList.vue @@ -62,7 +62,7 @@
- 新建 + 新建 删除 @@ -111,7 +111,14 @@
- + + + + + + + + @@ -181,7 +188,8 @@ }, selectedRowKeys: [], - selectedRows: [] + selectedRows: [], + visibleCreateModal:false } }, methods: { @@ -230,6 +238,16 @@ toggleAdvanced () { this.advanced = !this.advanced }, + //添加逻辑 + handleModalVisible(isVisible) { + this.visibleCreateModal = isVisible; + }, + handleCreateModalCancel() { + this.visibleCreateModal = false; + }, + handleCreateModalOk() { + this.visibleCreateModal = false; + }, }, watch: { /* diff --git a/ant-design-vue-jeecg/src/views/jeecg/InterfaceTest.vue b/ant-design-vue-jeecg/src/views/jeecg/InterfaceTest.vue index 117f7dca..8b30f73f 100644 --- a/ant-design-vue-jeecg/src/views/jeecg/InterfaceTest.vue +++ b/ant-design-vue-jeecg/src/views/jeecg/InterfaceTest.vue @@ -1,10 +1,12 @@ - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/system/NewPermissionList.vue b/ant-design-vue-jeecg/src/views/system/NewPermissionList.vue index ef6d49cb..55c1e1a1 100644 --- a/ant-design-vue-jeecg/src/views/system/NewPermissionList.vue +++ b/ant-design-vue-jeecg/src/views/system/NewPermissionList.vue @@ -53,7 +53,7 @@ - + 删除 diff --git a/ant-design-vue-jeecg/src/views/user/LoginSelectTenant.vue b/ant-design-vue-jeecg/src/views/user/LoginSelectTenant.vue index c91ffc3d..fd4b46d1 100644 --- a/ant-design-vue-jeecg/src/views/user/LoginSelectTenant.vue +++ b/ant-design-vue-jeecg/src/views/user/LoginSelectTenant.vue @@ -16,7 +16,7 @@ - + @@ -183,8 +183,8 @@ return false } this.departResolve().then(()=>{ + this.$store.dispatch('saveTenant', this.tenant_id); if(this.isMultiTenant){ - this.$store.dispatch('saveTenant', this.tenant_id); this.$emit('success') }else{ this.$emit('success') diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index a5499641..d0e81dc6 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -889,8 +889,12 @@ public class SysUserController { return result; } } - - if (!smscode.equals(code)) { + if(null == code){ + result.setMessage("手机验证码失效，请重新获取"); + result.setSuccess(false); + return result; + } + if (!smscode.equals(code.toString())) { result.setMessage("手机验证码错误"); result.setSuccess(false); return result; @@ -1039,7 +1043,7 @@ public class SysUserController { if (oConvertUtils.isEmpty(token)) { username = JwtUtil.getUserNameByToken(request); } else { - username = JwtUtil.getUsername(token); + username = JwtUtil.getUsername(token); } log.info(" ------ 通过令牌获取部分用户信息，当前用户： " + username); -- GitLab