From dc46884293bbce3af1c8ddd7a5f8888a69fbde40 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 16 Aug 2022 09:53:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/system/impl/SystemAuthAdminServiceImpl.java | 2 +- server/like-generator/src/main/resources/vue/edit.vue.vm | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthAdminServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthAdminServiceImpl.java index 89d89c3a..e37350e3 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthAdminServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthAdminServiceImpl.java @@ -300,7 +300,7 @@ public class SystemAuthAdminServiceImpl implements ISystemAuthAdminService { model.setIsDisable(systemAuthAdminParam.getIsDisable()); model.setUpdateTime(System.currentTimeMillis() / 1000); - if (systemAuthAdminParam.getPassword() != null) { + if (systemAuthAdminParam.getPassword() != null && !systemAuthAdminParam.getPassword().equals("")) { String salt = ToolsUtil.randomString(5); String pwd = ToolsUtil.makeMd5( systemAuthAdminParam.getPassword().trim() + salt); model.setPassword(pwd); diff --git a/server/like-generator/src/main/resources/vue/edit.vue.vm b/server/like-generator/src/main/resources/vue/edit.vue.vm index a930b82a..d94ff9f9 100644 --- a/server/like-generator/src/main/resources/vue/edit.vue.vm +++ b/server/like-generator/src/main/resources/vue/edit.vue.vm @@ -143,6 +143,8 @@ ${column.javaField}: '', #end #end + #end + #end }) const formRules = {